svn逻辑同步
parent
edc24d7efd
commit
ab411b3d0d
|
@ -1 +1 @@
|
|||
{"buglyId":"b67b061643", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "subChannel":"1", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"}
|
||||
{"channel":"47", "resUrl":"http://res-jl.38ejed.com/subChannel666/", "packageVersion":"0.4", "subChannel":"200417", "version":"0.16.14", "serverUrl":"http://139.9.223.139:8080/"}
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -9,12 +9,10 @@ __fields = {
|
|||
'Quality',
|
||||
'RewardView',
|
||||
'MonsterId',
|
||||
'PrivilegeId',
|
||||
'ForceShow'
|
||||
'PrivilegeId'
|
||||
},
|
||||
__defaults = {
|
||||
nil,
|
||||
{1,2},
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
|
@ -23,12 +21,11 @@ __defaults = {
|
|||
},
|
||||
__refs = {
|
||||
{1,.8,2.1,4.1,2.1},
|
||||
nil,
|
||||
{{{1,1},{1,.44}},{{1,2},{2,.44}},{{2,1},{3,.44}},{{2,2},{44,8,49,10,9,6,5,4,5,-96,9,50,9.2,-5.4,-98,10,50,11,8,-5.4,-99,56,6,10,6.2,-100,57,7,9,8,5,28.3}}},
|
||||
{1.9,-8,1.8,2.1,4.1},
|
||||
{{{1,1},{11,.8,-8,.8,46,.6,1,0,-10,.8,-21,.8}},{{1,2},{101,-4.2,2,3,-2.2,1,2,-21,-2.2,3,2,1,-2.3,-106,3,.3,2,.3,24,2,1.7,-27,1.2,10,1.5}},{{2,1},{4,.8,46,.6,1,0},{1.9,10,1.8}},{{2,2},{10,3,2,1.3,2,1,2,-21,3,5,8.2,-14,1},{1.9,10,1.8}}},
|
||||
{55,1.44},
|
||||
{{{1},{24,.8,1,2.1,4.1,.8}},{{2},{29,.8,1,2.1,4.1,.8}}},
|
||||
{44,8,49,10,9,6,5,4,5,-96,9,50,9.2,-5.4,-98,10,50,11,8,-5.4,-99,56,6,10,6.2,-100,57,7,9,8,5,28.3}
|
||||
{{{1},{24,.8,1,2.1,4.1,.8}},{{2},{29,.8,1,2.1,4.1,.8}}}
|
||||
},
|
||||
__refPoss = {
|
||||
nil,
|
||||
|
@ -36,7 +33,6 @@ __refPoss = {
|
|||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil
|
||||
},
|
||||
}
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
local EquipConfig = {
|
||||
__count = 127,
|
||||
__indexs = {60001,1,14,1,5,1,2,1,8,8.1,1.2,13,1.2,4,1.5,7,1.3,22,1.3,4.2,2,1.2,2,11,1.5,20,1.5,5,1.11,4939800,1.85},
|
||||
__values = {0,1.71,23,10,1.6,4,30,10,20,-30.2,20,10,60,6.2,60,-20.2,-50.2,130,50,120,40,60,100,1.92,2,29,80,60,300,100,30,170,200,40,360,70,530,180,-510.2,690,570,140,400,1200,210,190,400,2000,1.64,39,1.5,980,2530,2780,3620,1200,2800,8600,16800,22600,1800,35400,50800,56000,784002,1.2,5,1,2,1.2,2,1.7,4.3,2.1,1.61,2,1.3,10.2},
|
||||
__exVals = {194,nil,null,'1','无敌','18','100','50','适用全部神将','0','33','输出','16','20','32','24','12','25','55','3','40','10','60','普通攻击','175','无敌吸血盾','低','普通攻击附加灼烧的概率增加%s%%,技能附加灼烧的概率增加%s%%。','30','48','技能攻击','中毒','96','70','猎户大斧','兽骨大斧','戍卫战甲','硬木战甲','猎户草帽','兽皮兜帽','猎户草鞋','兽皮皮靴','乌木大斧','陨铁大斧','乌木战甲','陨铁战甲','乌木战盔','陨铁战盔','乌木战靴','陨铁战靴','御风战斧','困雨战斧','折雪战斧','屠戮战甲','明光战甲','冥魂战甲','神行战盔','乘风战盔','破空战盔','神行战靴','乘风战靴','破空战靴','断念神斧','斩尘神斧','凝墨神斧','碎弦神斧','虬龙仙甲','神凰羽衣','饕餮战衣','微澜羽衣','虬龙战盔','神凰战盔','饕餮战盔','微澜战盔','虬龙战靴','神凰战靴','饕餮战靴','无垠战靴','弹指神戟','刹那神戟','一念神戟','须臾神戟','劫火神戟','弹指神刺','炎帝战甲','句芒战甲','云龙战甲','霜狼战甲','银月战甲','赤阳战甲','六合战盔','八荒战盔','太初战盔','鸿蒙战盔','轩辕战盔','六合战靴','八荒战靴','太初战靴','鸿蒙战靴','轩辕战靴','昊天战盔','昊天战靴','嫦娥魂印','申公豹魂印','普贤菩萨魂印','文殊菩萨魂印','红孩儿魂印','混世魔王魂印','吴刚魂印','金翅大鹏魂印','妲己魂印','猪八戒魂印','伏羲魂印','精卫魂印','百花仙子魂印','唐僧魂印','九天玄女魂印','孙悟空魂印','降龙罗汉魂印','孔雀明王魂印','燃灯魂印','月光菩萨魂印','龙吉公主魂印','慈航道人魂印','蚩尤魂印','妈祖魂印','娥皇魂印','姜子牙魂印','骊山老祖魂印','巨灵神魂印','通天教主魂印','罗刹魂印','夜叉魂印','帝释天魂印','诛仙剑阵魂印','夜叉魔火魂印','妈祖庇佑魂印','姑获鸟魂印','敖丙魂印','义结金兰魂印','青鸟传信魂印','火烧连城魂印','破邪怒斩魂印','狂噬饕鬄魂印','哪吒魂印','失心暴怒魂印','起死回生魂印','破军魂印','辟邪守护魂印','破阵穿心魂印','饕鬄吞鲸魂印','斩妖净气魂印','羲农之佑魂印','除妖斩魔魂印','历战之躯魂印','舍身济世魂印','灵气护体魂印','灭魂一击魂印','见血封喉魂印','阴阳调和魂印','气运在握魂印','沉默概率增加%s%%','反伤比例增加%s%%','击杀目标回复自身%s点怒气','技能直接伤害转化为生命治疗当前生命最少的神将的比例提升%s%%','技能对己方生命最少神将造成治疗效果额外提升治疗神将自身攻击的%s%%','减伤盾减伤效果增加%s%%','眩晕概率增加%s%%','麻痹概率增加%s%%','技能的治疗效果提升%s%%,同时为技能目标附加%s个免伤盾。受到直接伤害降低%s%%持续%s回合。','造成的中毒伤害的%s%%转化为生命治疗自己','技能附加中毒的概率增加%s%%','%s单体目标时额外降低目标%s点怒气','中毒伤害增加%s%%','释放技能造成的%s附加封疗效果','中毒状态额外增加%s回合','直接伤害击杀目标后追加%s次技能,对敌方单体造成%s%%物理伤害。(追击技能不消耗怒气,不触发任何特性)','攻击纵排目标降低其%s点怒气','被灼烧的神将无法获得%s和%s效果','所有攻击优先攻击当前敌方生命最%s的神将','技能直接伤害的%%%s转化为生命治疗自己','灼烧状态额外增加%s回合','技能对己方生命最少的%s名神将造成治疗效果额外提升治疗神将自身攻击的%s%%','普攻有%s%%概率清除目标无敌,技能有%s%%概率清除目标无敌。','我方纵排、前排、后排输出神将对敌方造成伤害如被分摊其分摊比降低%s%%','技能直接击杀敌方目标时,获得目标剩余的所有怒气(%s神将佩戴)','每回合最多受到自身生命上限%s%%的伤害','同阵营神将受到直接伤害时该伤害%s%%转移给佩戴此魂印的神将转移伤害属于直接伤害','初始怒气增加%s点,并且强化暴毙触发的时机,目标血量低于%s%%即有概率触发暴毙','暴毙概率提升%s%%,杨戬直接伤害击杀的灼烧目标有%s%%概率无法复活,触发暴毙的目标%s%%概率无法复活','初始怒气增加%s点,敌方处于链接符状态的目标在回合结束时有%s%%概率减少%s点怒气','敌方处于链接符状态的目标在获得无敌盾时有%s%%概率获取失败','36','8','攻击'},
|
||||
__values = {0,1.71,23,10,1.6,4,30,10,20,-30.2,20,10,60,6.2,60,-20.2,-50.2,130,50,120,40,60,100,1.92,2,29,80,60,300,100,30,170,200,40,360,70,530,180,-510.2,690,570,140,400,1200,210,190,400,2000,1.64,39,1.5,980,2530,2780,3620,1200,2800,8600,16800,22600,1800,35400,50800,56000,784002,1.2,5,1,2,1.2,2,1.7,4.3,2.1,1.61,2,1.3,10.2,8999937},
|
||||
__exVals = {194,nil,null,'1','无敌','18','100','50','适用全部神将','0','33','输出','16','20','32','24','12','25','55','3','40','10','60','普通攻击','175','无敌吸血盾','低','普通攻击附加灼烧的概率增加%s%%,技能附加灼烧的概率增加%s%%。','30','48','技能攻击','中毒','96','70','猎户大斧','兽骨大斧','戍卫战甲','硬木战甲','猎户草帽','兽皮兜帽','猎户草鞋','兽皮皮靴','乌木大斧','陨铁大斧','乌木战甲','陨铁战甲','乌木战盔','陨铁战盔','乌木战靴','陨铁战靴','御风战斧','困雨战斧','折雪战斧','屠戮战甲','明光战甲','冥魂战甲','神行战盔','乘风战盔','破空战盔','神行战靴','乘风战靴','破空战靴','断念神斧','斩尘神斧','凝墨神斧','碎弦神斧','虬龙仙甲','神凰羽衣','饕餮战衣','微澜羽衣','虬龙战盔','神凰战盔','饕餮战盔','微澜战盔','虬龙战靴','神凰战靴','饕餮战靴','无垠战靴','弹指神戟','刹那神戟','一念神戟','须臾神戟','劫火神戟','弹指神刺','炎帝战甲','句芒战甲','云龙战甲','霜狼战甲','银月战甲','赤阳战甲','六合战盔','八荒战盔','太初战盔','鸿蒙战盔','轩辕战盔','六合战靴','八荒战靴','太初战靴','鸿蒙战靴','轩辕战靴','昊天战盔','昊天战靴','嫦娥魂印','申公豹魂印','普贤菩萨魂印','达摩魂印','红孩儿魂印','混世魔王魂印','吴刚魂印','金翅大鹏魂印','妲己魂印','猪八戒魂印','伏羲魂印','精卫魂印','百花仙子魂印','唐僧魂印','九天玄女魂印','孙悟空魂印','降龙罗汉魂印','孔雀明王魂印','燃灯魂印','月光菩萨魂印','龙吉公主魂印','九命猫魂印','蚩尤魂印','妈祖魂印','娥皇魂印','冥毒邪宴魂印','太阴星君魂印','巨灵神魂印','通天教主魂印','罗刹魂印','夜叉魂印','帝释天魂印','瘟癀疫病魂印','蚀骨火毒魂印','妈祖庇佑魂印','姑获鸟魂印','敖丙魂印','义结金兰魂印','青鸟传信魂印','火烧连城魂印','破邪怒斩魂印','狂噬戮兽魂印','哪吒魂印','失心暴怒魂印','起死回生魂印','破军魂印','辟邪守护魂印','破阵穿心魂印','饕餮吞鲸魂印','斩妖净气魂印','羲农之佑魂印','除妖斩魔魂印','历战之躯魂印','舍身济世魂印','灵气护体魂印','灭魂一击魂印','见血封喉魂印','阴阳调和魂印','气运在握魂印','沉默概率增加%s%%','反伤比例增加%s%%','击杀目标回复自身%s点怒气','技能直接伤害转化为生命治疗当前生命最少的神将的比例提升%s%%','技能对己方生命最少神将造成治疗效果额外提升治疗神将自身攻击的%s%%','减伤盾减伤效果增加%s%%','眩晕概率增加%s%%','麻痹概率增加%s%%','技能的治疗效果提升%s%%,同时为技能目标附加%s个免伤盾。受到直接伤害降低%s%%持续%s回合。','造成的中毒伤害的%s%%转化为生命治疗自己','技能附加中毒的概率增加%s%%','%s单体目标时额外降低目标%s点怒气','中毒伤害增加%s%%','释放技能造成的%s附加封疗效果','中毒状态额外增加%s回合','直接伤害击杀目标后追加%s次技能,对敌方单体造成%s%%物理伤害。(追击技能不消耗怒气,不触发任何特性)','攻击纵排目标降低其%s点怒气','被灼烧的神将无法获得%s和%s效果','所有攻击优先攻击当前敌方生命最%s的神将','技能直接伤害的%%%s转化为生命治疗自己','灼烧状态额外增加%s回合','技能对己方生命最少的%s名神将造成治疗效果额外提升治疗神将自身攻击的%s%%','普攻有%s%%概率清除目标无敌,技能有%s%%概率清除目标无敌。','我方纵排、前排、后排输出神将对敌方造成伤害如被分摊其分摊比降低%s%%','技能直接击杀敌方目标时,获得目标剩余的所有怒气(%s神将佩戴)','每回合最多受到自身生命上限%s%%的伤害','同阵营神将受到直接伤害时该伤害%s%%转移给佩戴此魂印的神将转移伤害属于直接伤害','初始怒气增加%s点,并且强化暴毙触发的时机,目标血量低于%s%%即有概率触发暴毙','暴毙概率提升%s%%,杨戬直接伤害击杀的灼烧目标有%s%%概率无法复活,触发暴毙的目标%s%%概率无法复活','初始怒气增加%s点,敌方处于链接符状态的目标在回合结束时有%s%%概率减少%s点怒气','敌方处于链接符状态的目标在获得无敌盾时有%s%%概率获取失败','36','8','攻击'},
|
||||
__fields = {
|
||||
'Id',
|
||||
'Name',
|
||||
|
@ -42,43 +42,43 @@ __defaults = {
|
|||
nil,
|
||||
nil,
|
||||
nil,
|
||||
{220},
|
||||
{221},
|
||||
nil,
|
||||
nil,
|
||||
1,
|
||||
219,
|
||||
220,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
219,
|
||||
220,
|
||||
1,
|
||||
1,
|
||||
1,
|
||||
nil
|
||||
},
|
||||
__refs = {
|
||||
{252,1.621},
|
||||
{253,1.621},
|
||||
{1,.71,1,-1,0,3.1,3.1,1.5,-3,1.3,2.1,-3,1.9,-5,1.5,-5,1.4,-4,1.5,0,-11,.85},
|
||||
{3,.7,1,2.1,.11,1,.51,1,.32,-2,8.2,.32,1,.41,12.2},
|
||||
nil,
|
||||
{2,0,1,0,1,4.3,-3,8.1,.2,1,2.1,4.3,-3,.3,1,2.1,4.3,-3,.5,1,2.1,.4,2.1,-1,1.2,.85},
|
||||
{2,1,-1,2.1,2.1,1.3,6.5,1.4,-2,1.2,2.1,-2,1.6,-3,1.3,2.1,-3,1.9,-5,1.5,-5,1.4,-4,1.5,0,-17,.85},
|
||||
{{{1,1},{3,0,1,0,1,0,-3,6.5,8.5,.2,2.1,2.1,-3,4.2,.3,2.1,2.1,-3,4.2,.5,2.1,1,.4,-3,.4,3,-3,24,-23,-1,2,23,-2,-4,1,-1,6,-24,9.2,22,-4,3,10.2},{77,1,2,1.2,-2.3,1.2,3,1.2,6.2,2,1.61,2,1.3,2.1}},{{1,2},{30,1,-12,1,-1,1,25,3,-16,3,-8,8.3,53,4,-47,3,2,-13,1,3,-4,1,3,54,2,3,-47,34,2,5,-51,-3.2,2,-8,3.2,52,4,2,54,-65,3,5,56,2,3,-81,-5.2,-3.2,6,-22,4.2,64,2,1,2,1,-64,65,-124,-5,49,-57,16,0,-3,0,39,5,-39,50,-60,44,0,5,-1,0},{77,1,2,1.2,-2.3,1.2,3,1.2,6.2,2,1.61,2,1.3,2.1}},{{2,1},{25,.3,2,.3,-4,.2,1,.2,-1,1},{47,1.3,3,2.1,1.2,3,1.4}},{{2,2},{33,7,5,38,-50,4.1,7,5,-12,7.3,0},{47,1.3,3,2.1,1.2,3,1.4}}},
|
||||
{{{1},{3,0,1,0,1,0,-3,6.5,8.5,.2,2.1,2.1,-3,4.2,.3,2.1,2.1,-3,4.2,.5,2.1,1,.4,-3,.4,3,-3,24,-23,-1,2,23,-2,-4,1,198,0,-199,199,.2,-193,193,-217,217,-218,218,.2,-216,22,194,.2,-198,198,.2,-195,195,.61,20.2,.3,9.2,.3}},{{2},{30,1,-12,1,-1,1,25,3,-16,3,-8,8.3,53,4,-47,3,2,-13,1,3,-4,1,3,54,2,3,-47,34,2,5,-51,-3.2,2,-8,3.2,52,4,2,54,-65,3,5,56,2,3,-81,-5.2,-3.2,6,-22,4.2,64,2,1,2,1,-64,65,-124,-5,49,-57,16,0,-3,0,39,5,-39,50,-60,44,0,5,-1,0},{77,1,2,1.2,-2.3,1.2,3,1.2,6.2,2,1.61,2,1.3,2.1}}},
|
||||
{{{1},{3,0,1,0,1,0,-3,6.5,8.5,.2,2.1,2.1,-3,4.2,.3,2.1,2.1,-3,4.2,.5,2.1,1,.4,-3,.4,3,-3,24,-23,-1,2,23,-2,-4,1,198,0,-199,199,.2,-193,193,-217,217,-218,218,.2,-216,22,194,.2,-198,198,.2,-195,195,.61,20.2,.3,9.2,.3}},{{2},{30,1,-12,1,-1,1,25,3,-16,3,-8,8.3,53,4,-47,3,2,-13,1,3,-4,1,3,54,2,3,-47,34,2,5,-51,-3.2,2,-8,3.2,52,4,2,54,-65,3,5,56,2,3,-81,-5.2,-3.2,6,-22,4.2,64,2,1,2,1,-64,65,-124,-5,49,-57,16,0,-3,0,39,5,-39,50,-60,44,0,5,-1,0},{77,1,2,1.2,-2.3,1.2,3,1.2,6.2,2,1.61,2,1.3,2.1}}},
|
||||
{{{1},{3,0,1,0,1,0,-3,6.5,8.5,.2,2.1,2.1,-3,4.2,.3,2.1,2.1,-3,4.2,.5,2.1,1,.4,-3,.4,3,-3,24,-23,-1,2,23,-2,-4,1,199,0,-200,200,.2,-194,194,-218,218,-219,219,.2,-217,22,195,.2,-199,199,.2,-196,196,.61,20.2,.3,9.2,.3}},{{2},{30,1,-12,1,-1,1,25,3,-16,3,-8,8.3,53,4,-47,3,2,-13,1,3,-4,1,3,54,2,3,-47,34,2,5,-51,-3.2,2,-8,3.2,52,4,2,54,-65,3,5,56,2,3,-81,-5.2,-3.2,6,-22,4.2,64,2,1,2,1,-64,65,-124,-5,49,-57,16,0,-3,0,39,5,-39,50,-60,44,0,5,-1,0},{77,1,2,1.2,-2.3,1.2,3,1.2,6.2,2,1.61,2,1.3,2.1}}},
|
||||
{{{1},{3,0,1,0,1,0,-3,6.5,8.5,.2,2.1,2.1,-3,4.2,.3,2.1,2.1,-3,4.2,.5,2.1,1,.4,-3,.4,3,-3,24,-23,-1,2,23,-2,-4,1,199,0,-200,200,.2,-194,194,-218,218,-219,219,.2,-217,22,195,.2,-199,199,.2,-196,196,.61,20.2,.3,9.2,.3}},{{2},{30,1,-12,1,-1,1,25,3,-16,3,-8,8.3,53,4,-47,3,2,-13,1,3,-4,1,3,54,2,3,-47,34,2,5,-51,-3.2,2,-8,3.2,52,4,2,54,-65,3,5,56,2,3,-81,-5.2,-3.2,6,-22,4.2,64,2,1,2,1,-64,65,-124,-5,49,-57,16,0,-3,0,39,5,-39,50,-60,44,0,5,-1,0},{77,1,2,1.2,-2.3,1.2,3,1.2,6.2,2,1.61,2,1.3,2.1}}},
|
||||
{{{1},{168,1.64},{70,1.2,5,1,2,1.2,2,1.7,4.3,2.1,1.61,2,1.3,2.1}},{{2},{215,1},{72,19}},{{3},{217,1},{72,19}}},
|
||||
{{{1},{49,-1,2,0,2,-3.3,-10,-3.3,-7,-3.3,-9,-3.3,2,-3.4,2,-15,-3.4,-10,-3.4,-12,-3.4}}},
|
||||
{1,.71,1,-1,0,3.1,6.4,.04,-1,.85},
|
||||
{1,.71,1,-1,0,3.1,6.4,.04,-1,.85},
|
||||
{2,0},
|
||||
{{{1,1},{7,.11}},{{1,2},{4,.11}}},
|
||||
{{{1,1},{15,.85},{69,1.85}},{{1,2},{158,.85},{69,1.85}}},
|
||||
{219,.76,3,.85},
|
||||
{{{1,1},{15,.85},{69,1.85}},{{1,2},{158,.64,61,.11},{69,1.85}}},
|
||||
{220,.76,3,.85},
|
||||
{{{1},{1,.7,106,-2,-104,112,-3,10,-119,.2,111,-111,121,-11,9,-119,0,115,27,-142,0,142,-11,11,-142,142,0,-26,14,-130,14.2,0,1,-4,3,-115,119,-7,-112,103,9,-112,.2,104,0,-104,141,0,12,0},{69,1.85}},{{2},{129,-19,37,-38,12,3,-9,-6,42,-11,0,-2,2,.2,-21,8,24,0,-32,-9,41,-42,1,36,-42,8,0},{77,3,1.2,4,2,1.2,3,1,7.2,2,1.3,3,1.4,2,1,2,1,4,1}},{{3},{104,31,-29,25,-25,42,-3,-8,-15,26,0,-11,-33,44,-42,-2,29,13,-28,0},{80,1.2,6,2,3,-5.2,1,3,1.4,2,1,2,1,4,1}},{{4},{108,37,-19,6,-6,3,-21,18,-18,41,-16,-12,0},{80,1.2,6,2,8,12,3,1,2,1,4,1}},{{5},{105,18,21,-39,0,20,5},{80,8,10,12,4,2,1}},{{6},{107,31,1,-32,0,7,35},{80,8,10,12,4,2,1}},{{7},{122,30,-30,0,14,-11},{80,8,22,4,2,1}},{{8},{146,-7,7,0,-5,-24},{80,8,22,4,2,1}},{{9},{133,.2,17,-36},{80,30,4,2,1}},{{10},{130,.2,-27,33},{80,30,4,2,1}},{{11},{147,.2,-13,7},{80,30,4,2,1}},{{12},{149,.2,-7,8},{80,30,4,2,1}},{{13},{125,.2,18,-40},{80,30,4,2,1}},{{14},{124,.2,16,-21},{80,30,4,2,1}},{{15},{112,.2,42,-20},{80,30,4,2,1}},{{16},{153,.2,-16},{80,30,4,3}},{{17},{135,.2,7},{80,30,4,3}},{{18},{117,.2,11},{80,30,4,3}},{{19},{114,.2,29},{80,30,4,3}},{{20},{136,.2,4},{80,30,4,3}},{{21},{141,.2,-14},{80,30,4,3}},{{22},{131,.2,23},{80,30,4,3}},{{23},{132,.2},{80,30,4}},{{24},{150,.2},{80,30,4}},{{25},{103,.2},{80,30,4}},{{26},{116,.2},{80,30,4}},{{27},{118,.2},{80,30,4}},{{28},{111,.2},{80,30,4}},{{29},{123,.2},{80,30,4}},{{30},{119,.2},{80,30,4}},{{31},{151,.2},{80,30,4}},{{32},{148,.2},{80,30,4}},{{33},{134,.2},{80,30,4}},{{34},{137,.2},{80,30,4}},{{35},{138,.2},{80,30,4}},{{36},{142,.2},{80,30,4}},{{37},{152,.2},{80,30,4}},{{38},{128,.2},{80,30,4}},{{39},{121,.2},{80,30,4}},{{40},{144,.2},{80,30,4}},{{41},{145,.2},{80,30,4}},{{42},{115,.2},{80,30,4}},{{43},{143,.2},{80,30,4}},{{44},{127,.2},{80,30,4}},{{45},{139,.2},{80,30,4}},{{46},{129,.2},{80,30,4}},{{47},{140,.2},{80,30,4}},{{48},{154,.2},{80,30,4}}},
|
||||
{219,.76,7,.7,153,1,-154,155,1.2,-157,.2,158,-158,159,1.2,-161,0,19,143,-162,0,163,1.2,-165,166,1.3,-169,0,19,151,1.3,-173,174,1,-175,176,1,-177,.2,178,1,-179,180,1.3},
|
||||
{{{1,1},{227,.7,6,13,-19,-6,2,13,-9,.2,7,-7,6,0,2,-8,0,4,8,-12,0,4,181,-181,-4,22,-28,.2,6,0,5,-10,22,-21,-2,6,10,-9,-1,-2,4,-2,.2,-2,13,-11,-6,10,-10,19},{69,1.85}},{{2,1},{233,-12,2,13,174,-180,4,1,5,-1,-8,10,-10,18,-28,.2,29,-28,22,-21,-2,16,-9,-3,4,-4,13},{77,3,1.2,4,2,1.2,3,1,7.2,2,1.3,3,1.4,2,1,2,1,4,1}},{{3,1},{221,2,13,-3,2,5,1,-20,0,29,-28,22,-21,-2,16,-12,0,4,-4,13},{80,1.2,6,2,3,-5.2,1,3,1.4,2,1,2,1,4,1}},{{4,1},{221,2,13,11,-12,6,-18,14,-13,1,4,-4,13},{80,1.2,6,2,8,12,3,1,2,1,4,1}},{{5,1},{221,190,-163,-25,1.2,4},{80,8,10,12,4,2,1}},{{6,1},{221,12,15,-25,1.2,4},{80,8,10,12,4,2,1}},{{7,1},{221,9,-7,1.2,4},{80,8,22,4,2,1}},{{8,1},{221,26,-24,1.2,4},{80,8,22,4,2,1}},{{9,1},{221,2,1.2,4},{80,30,4,2,1}},{{10,1},{221,2,1.2,4},{80,30,4,2,1}},{{11,1},{221,2,1.2,4},{80,30,4,2,1}},{{12,1},{221,-2.2,0,4},{80,30,4,2,1}},{{13,1},{221,-2.2,0,4},{80,30,4,2,1}},{{14,1},{221,2,5,-3,4},{80,30,4,2,1}},{{15,1},{221,2,1.2,4},{80,30,4,2,1}},{{16,1},{221,2,1,5},{80,30,4,3}},{{17,1},{221,2,1,5},{80,30,4,3}},{{18,1},{221,2,1,5},{80,30,4,3}},{{19,1},{221,2,1,5},{80,30,4,3}},{{20,1},{221,2,1,5},{80,30,4,3}},{{21,1},{221,2,1,5},{80,30,4,3}},{{22,1},{221,2,1,5},{80,30,4,3}},{{23,1},{221,2,1,5},{80,30,4,3}},{{24,1},{221,2,1,5},{80,30,4,3}},{{25,1},{221,2,5,-9},{80,30,4,3}},{{26,1},{221,2,5},{80,30,4}},{{27,1},{221,2,1},{80,30,4}},{{28,1},{221,2,1},{80,30,4}},{{29,1},{221,2,1},{80,30,4}},{{30,1},{221,2,1},{80,30,4}},{{31,1},{221,2,1},{80,30,4}},{{32,1},{221,2,1},{80,30,4}},{{33,1},{221,2,1},{80,30,4}},{{34,1},{221,2,1},{80,30,4}},{{35,1},{221,2,1},{80,30,4}},{{36,1},{221,2,1},{80,30,4}},{{37,1},{221,2,5},{80,30,4}},{{38,1},{221,2,5},{80,30,4}},{{39,1},{221,2,1},{80,30,4}},{{40,1},{221,2,1},{80,30,4}},{{41,1},{221,2,1},{80,30,4}},{{42,1},{221,2,1},{80,30,4}},{{43,1},{221,2,1},{80,30,4}},{{44,1},{221,2,1},{80,30,4}},{{45,1},{221,2,1},{80,30,4}},{{46,1},{221,2,1},{80,30,4}},{{47,1},{221,2,1},{80,30,4}},{{48,1},{221,2,1},{80,30,4}},{{1,2},{221,18,-18,21,-12,13,-11,-2,16,5,0},{90,3,-5.2,4,1,5,1,10,1.2}},{{1,3},{234,-10,-3},{90,35,1}},{{1,4},{221},{90}},{{2,2},{221,10,-10,21,-10,11,-11,-4},{90,3,-5.2,4,1,5,1}},{{2,3},{234},{90}},{{2,4},{221},{90}},{{3,2},{221,10,-10,21,-10,11,-11,-4},{90,3,-5.2,4,1,5,1}},{{3,3},{234},{90}},{{3,4},{221},{90}},{{4,2},{221,0,11,-8},{90,8,15,1}},{{4,3},{234},{90}},{{4,4},{221},{90}},{{5,2},{221,4},{98,16}},{{6,2},{221,7},{98,16}},{{7,2},{225},{114}},{{8,2},{225},{114}},{{9,2},{228},{114}},{{10,2},{235},{114}},{{11,2},{224},{114}},{{12,2},{225},{114}},{{13,2},{225},{114}},{{14,2},{228},{114}},{{15,2},{228},{114}},{{16,2},{225},{114}},{{17,2},{224},{114}},{{18,2},{224},{114}},{{19,2},{228},{114}},{{20,2},{228},{114}},{{21,2},{225},{114}},{{22,2},{225},{114}},{{23,2},{224},{114}},{{24,2},{225},{114}},{{25,2},{228},{114}},{{26,2},{230},{114}},{{27,2},{224},{114}},{{28,2},{228},{114}},{{29,2},{230},{114}},{{30,2},{224},{114}},{{31,2},{228},{114}},{{32,2},{228},{114}},{{33,2},{228},{114}},{{34,2},{224},{114}},{{35,2},{225},{114}},{{36,2},{225},{114}},{{37,2},{228},{114}},{{38,2},{230},{114}},{{39,2},{224},{114}},{{40,2},{224},{114}},{{41,2},{224},{114}},{{42,2},{230},{114}},{{43,2},{228},{114}},{{44,2},{225},{114}},{{45,2},{224},{114}},{{46,2},{228},{114}},{{47,2},{228},{114}},{{48,2},{228},{114}}},
|
||||
{220,.76,7,.7,153,1,-154,155,1.2,-157,.2,158,-158,159,1.2,-161,0,19,143,-162,0,163,1.2,-165,166,1.3,-169,0,19,151,1.3,-173,174,1,-175,176,1,-177,.2,178,1,-179,180,1.3},
|
||||
{{{1,1},{228,.7,6,13,-19,-6,2,13,-9,.2,7,-7,6,0,2,-8,0,4,8,-12,0,4,181,-181,-4,22,-28,.2,6,0,5,-10,22,-21,-2,6,10,-9,-1,-2,4,-2,.2,-2,13,-11,-6,10,-10,19},{69,1.85}},{{2,1},{234,-12,2,13,174,-180,4,1,5,-1,-8,10,-10,18,-28,.2,29,-28,22,-21,-2,16,-9,-3,4,-4,13},{77,3,1.2,4,2,1.2,3,1,7.2,2,1.3,3,1.4,2,1,2,1,4,1}},{{3,1},{222,2,13,-3,2,5,1,-20,0,29,-28,22,-21,-2,16,-12,0,4,-4,13},{80,1.2,6,2,3,-5.2,1,3,1.4,2,1,2,1,4,1}},{{4,1},{222,2,13,11,-12,6,-18,14,-13,1,4,-4,13},{80,1.2,6,2,8,12,3,1,2,1,4,1}},{{5,1},{222,190,-163,-25,1.2,4},{80,8,10,12,4,2,1}},{{6,1},{222,12,15,-25,1.2,4},{80,8,10,12,4,2,1}},{{7,1},{222,9,-7,1.2,4},{80,8,22,4,2,1}},{{8,1},{222,26,-24,1.2,4},{80,8,22,4,2,1}},{{9,1},{222,2,1.2,4},{80,30,4,2,1}},{{10,1},{222,2,1.2,4},{80,30,4,2,1}},{{11,1},{222,2,1.2,4},{80,30,4,2,1}},{{12,1},{222,-2.2,0,4},{80,30,4,2,1}},{{13,1},{222,-2.2,0,4},{80,30,4,2,1}},{{14,1},{222,2,5,-3,4},{80,30,4,2,1}},{{15,1},{222,2,1.2,4},{80,30,4,2,1}},{{16,1},{222,2,1,5},{80,30,4,3}},{{17,1},{222,2,1,5},{80,30,4,3}},{{18,1},{222,2,1,5},{80,30,4,3}},{{19,1},{222,2,1,5},{80,30,4,3}},{{20,1},{222,2,1,5},{80,30,4,3}},{{21,1},{222,2,1,5},{80,30,4,3}},{{22,1},{222,2,1,5},{80,30,4,3}},{{23,1},{222,2,1,5},{80,30,4,3}},{{24,1},{222,2,1,5},{80,30,4,3}},{{25,1},{222,2,5,-9},{80,30,4,3}},{{26,1},{222,2,5},{80,30,4}},{{27,1},{222,2,1},{80,30,4}},{{28,1},{222,2,1},{80,30,4}},{{29,1},{222,2,1},{80,30,4}},{{30,1},{222,2,1},{80,30,4}},{{31,1},{222,2,1},{80,30,4}},{{32,1},{222,2,1},{80,30,4}},{{33,1},{222,2,1},{80,30,4}},{{34,1},{222,2,1},{80,30,4}},{{35,1},{222,2,1},{80,30,4}},{{36,1},{222,2,1},{80,30,4}},{{37,1},{222,2,5},{80,30,4}},{{38,1},{222,2,5},{80,30,4}},{{39,1},{222,2,1},{80,30,4}},{{40,1},{222,2,1},{80,30,4}},{{41,1},{222,2,1},{80,30,4}},{{42,1},{222,2,1},{80,30,4}},{{43,1},{222,2,1},{80,30,4}},{{44,1},{222,2,1},{80,30,4}},{{45,1},{222,2,1},{80,30,4}},{{46,1},{222,2,1},{80,30,4}},{{47,1},{222,2,1},{80,30,4}},{{48,1},{222,2,1},{80,30,4}},{{1,2},{222,18,-18,21,-12,13,-11,-2,16,5,0},{90,3,-5.2,4,1,5,1,10,1.2}},{{1,3},{235,-10,-3},{90,35,1}},{{1,4},{222},{90}},{{2,2},{222,10,-10,21,-10,11,-11,-4},{90,3,-5.2,4,1,5,1}},{{2,3},{235},{90}},{{2,4},{222},{90}},{{3,2},{222,10,-10,21,-10,11,-11,-4},{90,3,-5.2,4,1,5,1}},{{3,3},{235},{90}},{{3,4},{222},{90}},{{4,2},{222,0,11,-8},{90,8,15,1}},{{4,3},{235},{90}},{{4,4},{222},{90}},{{5,2},{222,4},{98,16}},{{6,2},{222,7},{98,16}},{{7,2},{226},{114}},{{8,2},{226},{114}},{{9,2},{229},{114}},{{10,2},{236},{114}},{{11,2},{225},{114}},{{12,2},{226},{114}},{{13,2},{226},{114}},{{14,2},{229},{114}},{{15,2},{229},{114}},{{16,2},{226},{114}},{{17,2},{225},{114}},{{18,2},{225},{114}},{{19,2},{229},{114}},{{20,2},{229},{114}},{{21,2},{226},{114}},{{22,2},{226},{114}},{{23,2},{225},{114}},{{24,2},{226},{114}},{{25,2},{229},{114}},{{26,2},{231},{114}},{{27,2},{225},{114}},{{28,2},{229},{114}},{{29,2},{231},{114}},{{30,2},{225},{114}},{{31,2},{229},{114}},{{32,2},{229},{114}},{{33,2},{229},{114}},{{34,2},{225},{114}},{{35,2},{226},{114}},{{36,2},{226},{114}},{{37,2},{229},{114}},{{38,2},{231},{114}},{{39,2},{225},{114}},{{40,2},{225},{114}},{{41,2},{225},{114}},{{42,2},{231},{114}},{{43,2},{229},{114}},{{44,2},{226},{114}},{{45,2},{225},{114}},{{46,2},{229},{114}},{{47,2},{229},{114}},{{48,2},{229},{114}}},
|
||||
nil,
|
||||
nil,
|
||||
nil,
|
||||
|
|
|
@ -2,7 +2,7 @@ local EquipTalismana = {
|
|||
__count = 3900,
|
||||
__indexs = {1.0093},
|
||||
__values = {1.57,75,-15.4,-19.5,-27.5,10,21,24,7,31,7,24,21,10,35,4,39,14,25,32,7,39,11,32,25,18,39,4,43,34,5,4,51,21,30,-51.2,30,21,55,5,50,43,12,55,26,29,63,1,62,31,32,61,2,63,52,15,67,35,32,67,18,49,68,7,75,35,40,75,14,61,68,11,79,39,40,79,10,69,45,15,30,90,33,57,75,15,6,84,69,25,94,7,27,60,93,1,94,25,45,35,105,25,80,10,75,20,105,40,140,25,189,166,23,17,172,168,21,189,170,31,201,48,100,53,-201.2,85,140,225,175,50,-225.2,40,197,83,154,106,131,237,172,65,-270.2,15,255,270,55,40,175,282,163,119,282,219,63,282,275,40,60,255,315,110,205,315,260,780,760,20,780,-860.4,760,100,-1020.4,820,200,-1100.4,400,700,-1260.3,520,740,260,1000,-1340.2,320,1020,980,360,1340,1300,200,1500,3.1,300,1200,1580,1220,360,640,940,-1580.2,-900.2,-1800.2,500,1300,1800,1880,20,1860,1880,1260,620,1880,-2100.5,2001,1.15,7948,3201,1.41,986,2.1,4.1,6.5,785,201,15.31,21.41,1.51,985,19.8,10.3,42.12,18.1,12.1,37785,-14000.4,102000,-18000.4,82000,-22000.4,94000,-26000.4,106000,-30000.4,118000,-34000.4,130000,-38000.4,142000,-42000.4,22000,-24000.4,132000,-26000.4,142000,-28000.4,152000,-30000.4,162000},
|
||||
__exVals = {53,'风雷翅','镇海石','洛神赋','断玉钩','貔貅铃','九齿钉耙','倾世元禳','彩羽衣','混世魔刀','火尖枪','八卦云光帕','百花篮','万龙甲','金箍棒','金刚宝剑','锦襕袈裟','孔雀翎','灵柩灯','清泉瓶','伏虎钵','降龙杖','三钴杵','六牙白象','半月莲华','吠陀经','失心钵','八卦炉','混天绫','道德真经','九黎壶','雾露乾坤网','青鸟使','月兔','定火符','湘妃竹','伐桂斧','妈祖铜符','定海珠','两面三尖枪','雷公鞭','琉璃戒','打神鞭','巨灵盾','五行阵','入梦铃','纯阳剑','诛仙四剑','三宝如意','阴狱锁','孟婆汤','托天叉','阎王笔',nil},
|
||||
__exVals = {53,'风雷翅','镇海石','洛神赋','断玉钩','貔貅铃','九齿钉耙','倾世元禳','彩羽衣','混世魔刀','火尖枪','八卦云光帕','百花篮','万龙甲','金箍棒','达摩禅经','锦襕袈裟','孔雀翎','灵柩灯','清泉瓶','伏虎钵','降龙杖','三钴杵','六牙白象','半月莲华','吠陀经','失心钵','八卦炉','混天绫','道德真经','九黎壶','雾露乾坤网','青鸟使','月兔','定火符','湘妃竹','伐桂斧','妈祖铜符','定海珠','两面三尖枪','雷公鞭','琉璃戒','打神鞭','巨灵盾','五行阵','太阴杖','纯阳剑','诛仙四剑','三宝如意','阴狱锁','孟婆汤','托天叉','阎王笔',nil},
|
||||
__fields = {
|
||||
'Id',
|
||||
'TalismanaId',
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
local ErrorCodeHint = {
|
||||
__count = 126,
|
||||
__indexs = {-110,109,1.421},
|
||||
__count = 127,
|
||||
__indexs = {-110,109,1.521},
|
||||
__values = {1.2},
|
||||
__exVals = {124,'兑换码已使用','材料不足','当前在线人数过多,请稍等哦','服务器开了个小差,请稍后再试','服务器紧急修复中','该名字已被使用','名字长度为2-6个字','登录密码错误','该用户名已被注册','该用户不存在','提示#背包已满','道具不足','需购买改名卡','工坊满级','已经达到当前最大等级','玩家等级不足','活动未开启','竞技场刷新对手冷却时间中','战斗异常!','尚未加入公会','对方不是您的好友','外地召唤次数不足','跳过战斗功能尚未解锁','外敌入侵正在战斗中','兑换码无效','已达兑换上限','兑换人数过多,请稍后重试','公会名字不能为空','公会不存在','您已加入过公会','已达当前申请上线','该公会限制条件已修改,请刷新页面','当前公会被申请已达上限','申请条件不符','申请人数过多,请稍后重试','未加入公会','无操作权限','公会战期间不允许加入成员','公会成员剩余名额不足','部分成员已经加入其他工会','该成员已经加入其他工会','公会人数已满','不可以操作自己','公会战期间不允许踢出成员','该成员已被踢出','公会战期间不允许任命','官员人数已达上限','公会战期间不允许解散公会','包含敏感字','会长不能退出公会','名字不合法','请先领取特权每日奖励','无该头像框','首领已出现,当前炸弹不可用','当前无炸弹','好友已达上限','没有申请的好友','对方好友已达上限','对方已是您的好友','对方已将您加入黑名单','您没有该好友','黑名单列表已满','对方已在黑名单中','已赠送过好友友情点','已超过当日领取上限','已领取赠礼','不能搜索自己','该玩家不存在','神将数量已达上限','神将已达当前最大等级','level wrong','未达到进阶需求等级','所选神将祭品不符合','法宝只能穿戴一个','玩家等级不够,无法装备!','神将等级不够,无法装备!','神将已达上限','装备穿戴失败','选中物品中有不可分解道具','超过单次使用上限','该道具不能使用','无可分解神将','无该神将','该神将已上锁','该神将在阵容中','不可分解','无可分解装备','无该装备','该装备已穿戴','该装备不可分解','无可分解魂印','无该魂印','该魂印已穿戴','该魂印不可分解','该副本不可扫荡','副本尚未三星通关','该副本尚未通关','功绩不足','该奖励已购买','手机号不合法','领取失败','该邮件没有奖励可以领取','刷新次数不足','已达当前最高等级','该礼包已经购买','在地图探索中,不可以操作','英雄%s秒后复活','奖励正在积攒中!','对方已被您加入黑名单,无法添加好友','名字不能为空','公会名长度不符','此名已存在','公会宣言长度不符','今天已经给他点过赞了','该红包已不存在','暂无可添加好友','您所在的公会或您没有达到领奖条件','您已领取过奖励','您援助了%s%s*%s','%s援助了您%s*%s','%s在公会中需求了%s*%s,赶紧来帮助吧!','%s在公会中需求了%s*%s和%s*%s,赶紧来帮助吧!','%s援助了%s%s*%s','需先领取上一奖励!'},
|
||||
__exVals = {125,'兑换码已使用','材料不足','当前在线人数过多,请稍等哦','服务器开了个小差,请稍后再试','服务器紧急修复中','该名字已被使用','名字长度为2-6个字','登录密码错误','该用户名已被注册','该用户不存在','提示#背包已满','道具不足','需购买改名卡','工坊满级','已经达到当前最大等级','玩家等级不足','活动未开启','竞技场刷新对手冷却时间中','战斗异常!','尚未加入公会','对方不是您的好友','外地召唤次数不足','跳过战斗功能尚未解锁','外敌入侵正在战斗中','兑换码无效','已达兑换上限','兑换人数过多,请稍后重试','公会名字不能为空','公会不存在','您已加入过公会','已达当前申请上线','该公会限制条件已修改,请刷新页面','当前公会被申请已达上限','申请条件不符','申请人数过多,请稍后重试','未加入公会','无操作权限','公会战期间不允许加入成员','公会成员剩余名额不足','部分成员已经加入其他工会','该成员已经加入其他工会','公会人数已满','不可以操作自己','公会战期间不允许踢出成员','该成员已被踢出','公会战期间不允许任命','官员人数已达上限','公会战期间不允许解散公会','包含敏感字','会长不能退出公会','名字不合法','请先领取特权每日奖励','无该头像框','首领已出现,当前炸弹不可用','当前无炸弹','好友已达上限','没有申请的好友','对方好友已达上限','对方已是您的好友','对方已将您加入黑名单','您没有该好友','黑名单列表已满','对方已在黑名单中','已赠送过好友友情点','已超过当日领取上限','已领取赠礼','不能搜索自己','该玩家不存在','神将数量已达上限','神将已达当前最大等级','level wrong','未达到进阶需求等级','所选神将祭品不符合','法宝只能穿戴一个','玩家等级不够,无法装备!','神将等级不够,无法装备!','神将已达上限','装备穿戴失败','选中物品中有不可分解道具','超过单次使用上限','该道具不能使用','无可分解神将','无该神将','该神将已上锁','该神将在阵容中','不可分解','无可分解装备','无该装备','该装备已穿戴','该装备不可分解','无可分解魂印','无该魂印','该魂印已穿戴','该魂印不可分解','该副本不可扫荡','副本尚未三星通关','该副本尚未通关','功绩不足','该奖励已购买','手机号不合法','领取失败','该邮件没有奖励可以领取','刷新次数不足','已达当前最高等级','该礼包已经购买','在地图探索中,不可以操作','英雄%s秒后复活','奖励正在积攒中!','对方已被您加入黑名单,无法添加好友','名字不能为空','公会名长度不符','此名已存在','公会宣言长度不符','今天已经给他点过赞了','该红包已不存在','暂无可添加好友','您所在的公会或您没有达到领奖条件','您已领取过奖励','您援助了%s%s*%s','%s援助了您%s*%s','%s在公会中需求了%s*%s,赶紧来帮助吧!','%s在公会中需求了%s*%s和%s*%s,赶紧来帮助吧!','%s援助了%s%s*%s','需先领取上一奖励!','奖励已领取'},
|
||||
__fields = {
|
||||
'Id',
|
||||
'ShowType',
|
||||
|
@ -14,7 +14,7 @@ __defaults = {
|
|||
},
|
||||
__refs = {
|
||||
{2},
|
||||
{5,1.22,-24,0,25,1.15,-75,76,1.8,-84,85,1.73}
|
||||
{5,1.22,-24,0,25,1.15,-75,76,1.8,-84,85,1.83}
|
||||
},
|
||||
__refPoss = {
|
||||
{9},
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1,8 +1,8 @@
|
|||
local ExpeditionNodeConfig = {
|
||||
__count = 11,
|
||||
__indexs = {1.11},
|
||||
__values = {-35,35,1.11,14,15,5,20,5,10,120,202,398,387,1314,1.2},
|
||||
__exVals = {26,.13,nil,'精英节点','首领节点','复活节点','回复节点','普通节点','圣物节点','招募节点','商店节点','试炼节点','贪婪节点','奖励节点','live2d_tianjiang','live2d_tiangongboss','d_danaotiangong_bagualu','d_danaotiangong_pantao','live2d_tianbing','d_danaotiangong_shengwu','d_danaotiangong_linglongta','d_danaotiangong_baoku','d_danaotiangong_wuzhishan','d_danaotiangong_yaochi','UI_effect_ExpeditionReward',1.5,'idle'},
|
||||
__values = {-35,35,1.11,14,15,5,20,5,10,120,202,398,387},
|
||||
__exVals = {26,.13,1.5,nil,'精英节点','首领节点','复活节点','回复节点','普通节点','圣物节点','招募节点','商店节点','试炼节点','贪婪节点','奖励节点','live2d_tianjiang','live2d_tiangongboss','d_danaotiangong_bagualu','d_danaotiangong_pantao','live2d_tianbing','d_danaotiangong_shengwu','d_danaotiangong_linglongta','d_danaotiangong_baoku','d_danaotiangong_wuzhishan','d_danaotiangong_yaochi','UI_effect_ExpeditionReward','idle'},
|
||||
__fields = {
|
||||
'Id',
|
||||
'name',
|
||||
|
@ -24,21 +24,21 @@ __defaults = {
|
|||
4,
|
||||
3,
|
||||
nil,
|
||||
52,
|
||||
28,
|
||||
49,
|
||||
2,
|
||||
28,
|
||||
28
|
||||
2,
|
||||
26,
|
||||
26
|
||||
},
|
||||
__refs = {
|
||||
{29,1.01},
|
||||
{27,1.01},
|
||||
{3,1.01},
|
||||
{40,1.01},
|
||||
{38,1.01},
|
||||
{3,.2,2},
|
||||
{27,.2,24},
|
||||
{24,.2,1},
|
||||
{{{1},{2,.9,21}},{{2},{19,0,-3,0,3,-18,17,-1,.2,4}}},
|
||||
nil,
|
||||
{{{1},{25,1,-2}}},
|
||||
{4,21,-22},
|
||||
{3,1.2},
|
||||
{{{1,1},{3,.2}},{{1,2},{20,-18,20}},{{2,1},{4,.2}},{{2,2},{22,-20,18}},{{3,1},{5,.2}},{{3,2},{2,.2}}},
|
||||
{{{1,1},{3}},{{1,2},{14}},{{2,1},{4}},{{2,2},{15}},{{3,1},{5}},{{3,2},{12}}}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
local FoodsConfig = {
|
||||
__count = 77,
|
||||
__indexs = {1.8,7,2,3,1.21,969,1,8199,1.03,390870,1.2,98,1.2,1599798,1.2,998,1.11},
|
||||
__values = {-3000,1000,-500.4,1.7,8,10,5,25,1,5,1.4,2,1,32,-100.2,-50.2,-100.2,-200.2,500,100,400,1000,500,1500,5000,10000,84011,97017,3799982,1,998,1},
|
||||
__values = {-3000,1000,-500.4,1.7,8,10,5,25,1,5,1.4,2,1,32,-100.2,-50.2,-100.2,-200.2,500,100,400,1000,500,1500,5000,94011,97017,3799982,1,998,1},
|
||||
__exVals = {44,nil,null,'显示附近区域','r_buff_healing','r_buff_Attack_Up','r_buff_CriticalD_Up','r_buff_CriticalR_Up','每位成员恢复最大生命50%','增加攻击、防御、魔抗、速度各200','增加攻击350','增加防御、魔抗各350','你中毒了!全属性降低!','身上的毒解掉了!','每位成员失去30%当前血量','护甲魔抗加200','护甲魔抗加500','护甲魔抗加800','护甲魔抗加1200','攻击加500','攻击加1000','攻击加1500','攻击加2000','速度减20%、攻击加30%','损失30%当前生命、攻击提升30%','速度降低20%、防御提升20%','攻击、速度、护甲、魔抗降低10%','攻击、速度、护甲、魔抗上升10%','每位成员失去15%当前生命','每位成员回复20%最大生命','生命+2%、攻击+2%','攻击+2%','生命+2%','生命+20%','生命+50%','生命+100%','攻击+3%','攻击+6%','攻击+15%','暴击率+3%','暴击率+6%','暴击率+15%','暴击伤害+8%','暴击伤害+16%','暴击伤害+35%'},
|
||||
__fields = {
|
||||
'Id',
|
||||
|
@ -21,17 +21,17 @@ __defaults = {
|
|||
nil,
|
||||
nil,
|
||||
nil,
|
||||
49,
|
||||
48,
|
||||
nil
|
||||
},
|
||||
__refs = {
|
||||
{6,10,-10,9,0,-9,.81,5,3,.03,-8,.02},
|
||||
{7,.4,1,-1,.2,3.2,.31,1,-2,.03,2,0,-1,1,3.2,.51},
|
||||
{7,.4,1,-1,.2,3.2,.31,1,-2,.03,2,0,-1,1,3.2,.51},
|
||||
{{{1,1},{24,-16,16,-16,1,3,8,0,5,-13,-3,.3,-1,.3,15,2,-2,-3,0,4,-17,43,.03,-37,0,12,-12,0,11,-5,1,-1,5,.2,-4,.2,-3,.2,1,.2}},{{1,2},{40,-13,13,-11,0,14,-40,32,-34,43,-17,1,0,2,1,.3,-29,-1,1,2,30,-29,21,19,1,-43,44,1,-11,5,.2,-5,3,1,-13,4,3,-7,4,3,-2,-3.2},{26,1.03}},{{2,1},{9,1,11,0,-11,.3,10,0,1,2,0,2.1},{2,3,2,1,3,1.3,5,1.4,40,2}},{{2,2},{27,2,-26,32,-8,1,0,2,8,0,-1,-33,30,5.2},{2,3,2,1,3,1.3,5,1.4,40,2}},{{3,1},{10,12,.2,-1,0,-1},{2,5,1,13,1.2,40}},{{3,2},{27,-24,32,2,-33,30,8},{2,5,1,13,1.2,40}},{{4,1},{11,12,0,-1,0},{2,5,1,14,1}},{{4,2},{27,-24,32,-31,30},{2,5,1,14,1}}},
|
||||
{56,1,-1,2,1,-10,11,1.2,-13,14,1.21,-26,.23,2,0,25,-25,0,26,1.51},
|
||||
{{{1,1},{24,-16,16,-16,1,3,8,0,5,-13,-3,.3,-1,.3,15,2,-2,-3,0,4,-17,42,.03,-36,0,12,-12,0,11,-5,1,-1,5,.2,-4,.2,-3,.2,1,.2}},{{1,2},{40,-13,13,-11,0,13,-39,32,-34,42,-16,1,0,2,1,.3,-29,-1,1,2,30,-29,21,18,1,-42,43,1,-10,-10,.2,10,3,1,-13,4,3,-7,4,3,-2,-3.2},{26,1.03}},{{2,1},{9,1,11,0,-11,.3,10,0,1,2,0,2.1},{2,3,2,1,3,1.3,5,1.4,40,2}},{{2,2},{27,2,-26,32,-8,1,0,2,8,0,-1,-33,30,-7,0},{2,3,2,1,3,1.3,5,1.4,40,2}},{{3,1},{10,12,.2,-1,0,-1},{2,5,1,13,1.2,40}},{{3,2},{27,-24,32,2,-33,30,-7},{2,5,1,13,1.2,40}},{{4,1},{11,12,0,-1,0},{2,5,1,14,1}},{{4,2},{27,-24,32,-31,30},{2,5,1,14,1}}},
|
||||
{55,1,-1,2,1,-10,11,1.2,-13,14,1.21,-26,.23,2,0,25,-25,0,26,1.51},
|
||||
{8,.42,-1,.03,1,.02},
|
||||
{52,.2,1,2.1,4.3},
|
||||
{51,.2,1,2.1,4.3},
|
||||
{7,1,-1,1.2,-3,4,-4,6.2,3,.3,-1,.5,1.2,-4,0,4,-4,.53,1,-1,.2,1,2.1,.8}
|
||||
},
|
||||
__refPoss = {
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -21,7 +21,7 @@ __defaults = {
|
|||
1259
|
||||
},
|
||||
__refs = {
|
||||
{6,.11,7,0,-8,1,0,-4,4,.9,3,-1,.4,-1,-1,2,-6,0,6,4,-6,.2,1,-1,.2,-4,4.2,4,-3,6,-3,0,2,.5,-2,.4,3,-7,6,.2,-2,18.2,4,.5,3,-3,-4,6,.2,3,-5,47.3,5,0,-5,3,2,-9,23.3,.9,-4,4,.6,59.3,-6,0,4,.8,-4,7,55.2,39.4,.01,3,8.3,.6,-4,0,4,4.2,7,65.3,.2,80.2,4,.32,67.5,.5,16.3,.7,29.4,0,29.4,9.2,.3,-2,.3,9.3,0,18.4,27.2,0,4,64.8,.3,26.8,.2,5,-5,.7,3,-7,0,58.3,9.2,2.1,82.3,6,.2,1,-3,7.1,.8,5,-5,9.6,0,9.2,.9,100.3,0,107.3,3,3.1,-3,.2,3.1,3.2,.3,6.1,18.8,15.6,3.1,15.3,12.5,-1,-2,.6,8,1.5,-16,-1,.7,1,3.1,6.1,12.1,24.1,48.1,96.1,108.701,4,5,-2,-3,.2,-4,0,7,3,-6,9.1,18.71,-1,-5,.2,3,-7,4,.4,6,8.1,16.1,-6,.41,1,2,0,-3,7.1,14.1,7.2,.7,3,2,-5,.8,4.1,8.7,.3,5,54.2,2,0,-2,0,5,.3,506.5,0,490.4,.3,-9,.7,4,.5,21.5,.4,-3,6.2,.2,6.2,27.4,7,125.3,.4,4,3},
|
||||
{6,.11,7,0,-8,1,0,-4,4,.9,3,-1,.4,-1,-1,2,-6,0,6,4,-6,.2,1,-1,.2,-4,4.2,4,-3,6,-3,0,2,.5,-2,.4,3,-7,6,.2,-2,18.2,4,.5,3,-3,-4,6,.2,3,-5,47.3,5,0,-5,3,2,-9,23.3,.9,-4,4,.6,59.3,-6,0,4,.8,-4,7,55.2,39.4,.01,3,8.3,.6,-4,0,4,4.2,7,65.3,.2,80.2,4,.32,67.5,.5,16.3,.7,29.4,0,29.4,9.2,.3,-2,.3,9.3,0,18.4,27.2,0,4,64.8,.3,26.8,.2,5,-5,.7,3,-7,0,58.3,9.2,2.1,82.3,6,.2,1,-3,7.1,.8,5,-5,9.6,0,9.2,.9,100.3,0,107.3,3,3.1,-3,.2,3.1,3.2,.3,6.1,18.8,15.6,3.1,15.3,12.5,-1,97.2,4,0,-4,8,1.5,-16,-1,.7,1,3.1,6.1,12.1,24.1,48.1,96.1,108.701,4,5,-2,-3,.2,-4,0,7,3,-6,9.1,18.71,-1,-5,.2,3,-7,4,.4,6,8.1,16.1,-6,.41,1,2,0,-3,7.1,14.1,7.2,.7,3,2,-5,.8,4.1,8.7,.3,5,54.2,2,0,-2,0,5,.3,509.5,0,493.4,.3,-9,.7,4,.5,21.5,.4,-3,6.2,.2,6.2,27.4,7,125.3,.4,4,3},
|
||||
{34,.11,87,1.8,-44,45,1.5,-110,61,1.5,45,1,-109,12,98,1.4,-51,52,1.7,-125,126,1,-66,1.4,63,1.5,-133,3,-4,.2,135,1.2,-126,127,1.5,-142,143,-140,10.2,145,1,-129,-6,136,1.3,-149,150,-147,11.2,152,-84,85,1.7,9.2,-92,93,1.4,-165,-1,.4,16,38,113,1.6,-118,14,105,-173,-1,.2,175,1.2,-123,124,1.4,-162,163,1.3,-116,-69,12.2,56,131,1.5,-138,-38,40,0,137,-132,10,123,-137,138,-194,56,0,-57,.2,196,1.2,-195,69,0,127,-196,.71,17,180,-199,87.3,21,180,1.4,-189,190,-185,.2,52,134,1.3,-209,45.2,211,1.2,-202,203,1,-195,196,1,-147,148,-217,-1,.3,219,1,-165,166,-217,7,60,2,-72,24.2,222,1.5,-223,7,217,1,-228,9.2,230,1.3,-175,176,1.2,-235,28.2,59,178,6.2,12,42,182,14.3,1.5,-248,249,-239,-11,.2,251,1.01,-257,7,6.2,1,73,188,1.3,-210,211,-262,10.4,266,-193,194,1.3,-212,213,1.3,-271,12.4,19,256,1.6,-223,-1,225,1.2,-285,.2,4,7,-10,7,1,-8,3.1,7,1,4,-12,4.1,4.3,9,-21,9.1,25.01,21.9,4.3,20.4,16.6,285,1.4,-215,0,216,1.609,-1174,1.5,-10,-3,-14,5,17,6.1,12.11,23,1.3,-31,3,29,1,-17,18,1,-30,10.1,20.1,31,-30,0,31,1.2,-33,-5,.5,39,1.2,-42,43,-37,-1,14.1,28.1,39,1.7,400.2,-47,5.1,10.1,1192,1.2,-1124,1.7,1118,1.3,-1120,1121,1.5,-1192,1193,-1126,1,-85,1211,1,-1126,1.3,-75,76,1123,1,-1123,1.2,1122,1.3,-1142,1.2,6,1,-4,1,-7,11,1.3,-10,1,-21,1160,1.31,-1229,7,-10,83,-24,0,-45,76,1.3,1140,-1233},
|
||||
{2,1,4,1.2,2,1,2,4,-3,1,-12,-3,0,5,2,0,-6,6,.2,3.2,.5,-7,8,.4,4,-5,1,-7,1,6,9,-17,.2,12,-5,18.2,10,-9,8,1,-11,7,0,1,.5,-1,.4,-7,1,7,.2,1,0,-2,-5,1,11,1,-8,.2,-7,7,-6,7,.2,-1,.2,-5,5,9.2,0,-7,0,26.3,32.2,10,.3,-10,-5,5,.6,65.3,-6,-1,.3,6,.5,-5,-2,8,32.3,-6,6,.01,-7,8.3,.6,-6,1,5,.3,3,-3,-5,-1,-1,2,0,6,60.2,1,84.3,0,7,4,.71,-4,32.2,57.3,43.2,5,.8,37.3,7,-1,-13,1,5,.5,3,-10,8,.3,63.2,-6,1,8,-3,19.3,-6,.2,15,.2,-16,1,5,80.2,75.4,-5,5,.3,-7,28.3,4,-1,-3,77.3,128.3,17.3,0,3,38.2,1.2,6,28.2,-7,7,2.1,.4,3,24.3,6,.2,-8,7,.5,3,-9,8.5,0,-5,.2,50.3,7,21.6,0,9.2,.9,1,121.3,-2,10.4,3.1,64.4,3.2,31.3,6.1,18.6,15.6,3.1,15.3,12.5,8,13,1,-20,5,13,0,-8,-5,.3,11,1,-9,-9,.7,9,3.1,6.1,12.1,24.1,48.1,96.1,108.701,-1,7,-7,10,0,-3,-5,0,-2,17,-17,10.1,20.91,-7,-3,403.3,6,1,.3,9,9.1,18.1,-10,.21,3,0,2,-12,0,7,10,9.1,18.1,-17,10,.4,-3,646.3,90.2,8.1,16.51,-7,.2,3,-9,5,0,-1,3,-5,0,1,.3,5,-5,.5,531.3,3,724.3,6,.3,-12,.3,1,.2,-1,9,.2,-6,28.6,7,.4,-5,3,-4,.41,-6,1,-2,12,-5,0,-6,0,1,.2,8,-10},
|
||||
{1,.31,2,.2,-1,1,.9,-2,2,.7,-1,0,1,0,-2,.2,2,.3,-1,1,2.1,9.2,2,.21,-2,1.2,.5,9.2,.5,9.2,5.2,33.3,0,22.3,0,1,-2,1,0,1,.21,-1,1,.6,-2,2,.4,-1,.4,20.4,26.2,-1,2,38.3,.01,-2,2,.9,31.3,.6,14.3,25.2,.2,1,.42,-1,1,.8,3.1,38.4,21.3,91.8,2,20.2,0,1,48.6,.3,20.6,88.3,.7,83.4,115.5,61.2,17.3,-2,2,7.1,64.3,9.6,101.3,114.2,5.2,2,64.3,3.1,17.3,3.1,63.3,6.1,18.6,15.6,44.4,12.8,.31,-1,.109,-1,215.3,55.3,4.1,9.1,18.51,95.3,227.4,6.1,12.9,.12,-2,0,2,.71,4.1,8.7,129.3,.6,22.2,5.1,10.1,178.3,.6,-1,.3,180.5,153.4,-1,.11,1,.9,273.3,277.4,19.3,96.4,9.2,-2},
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -101,6 +101,8 @@ GameEvent = {
|
|||
ShowEnemyInfo="Map.ShowEnemyInfo",
|
||||
-- 刷新英雄血量
|
||||
RefreshHeroHp="Map.RefreshHeroHp",
|
||||
-- 停止走路
|
||||
StopWalk="Map.StopWalk",
|
||||
},
|
||||
Event = {
|
||||
PointTrigger = "Event.PointTrigger",
|
||||
|
|
|
@ -80,6 +80,10 @@ CHAMPIONGUESSSUCCESSINDICATION = protobuf.Descriptor();
|
|||
CHAMPIONGUESSSUCCESSINDICATION_ROUNDTIMES_FIELD = protobuf.FieldDescriptor();
|
||||
CHAMPIONGUESSSUCCESSINDICATION_ITEMID_FIELD = protobuf.FieldDescriptor();
|
||||
CHAMPIONGUESSSUCCESSINDICATION_ITEMNUM_FIELD = protobuf.FieldDescriptor();
|
||||
TAKEARENABATTLEREWARDREQUEST = protobuf.Descriptor();
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD = protobuf.FieldDescriptor();
|
||||
TAKEARENABATTLEREWARDRESPONSE = protobuf.Descriptor();
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
GETARENAINFORESPONSE_ARENAINFO_FIELD.name = "arenaInfo"
|
||||
GETARENAINFORESPONSE_ARENAINFO_FIELD.full_name = ".com.ljsd.jieling.protocols.GetArenaInfoResponse.arenaInfo"
|
||||
|
@ -790,6 +794,41 @@ CHAMPIONGUESSSUCCESSINDICATION.enum_types = {}
|
|||
CHAMPIONGUESSSUCCESSINDICATION.fields = {CHAMPIONGUESSSUCCESSINDICATION_ROUNDTIMES_FIELD, CHAMPIONGUESSSUCCESSINDICATION_ITEMID_FIELD, CHAMPIONGUESSSUCCESSINDICATION_ITEMNUM_FIELD}
|
||||
CHAMPIONGUESSSUCCESSINDICATION.is_extendable = false
|
||||
CHAMPIONGUESSSUCCESSINDICATION.extensions = {}
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.name = "missionId"
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.full_name = ".com.ljsd.jieling.protocols.TakeArenaBattleRewardRequest.missionId"
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.number = 1
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.index = 0
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.label = 1
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.has_default_value = false
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.default_value = 0
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.type = 5
|
||||
TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD.cpp_type = 1
|
||||
|
||||
TAKEARENABATTLEREWARDREQUEST.name = "TakeArenaBattleRewardRequest"
|
||||
TAKEARENABATTLEREWARDREQUEST.full_name = ".com.ljsd.jieling.protocols.TakeArenaBattleRewardRequest"
|
||||
TAKEARENABATTLEREWARDREQUEST.nested_types = {}
|
||||
TAKEARENABATTLEREWARDREQUEST.enum_types = {}
|
||||
TAKEARENABATTLEREWARDREQUEST.fields = {TAKEARENABATTLEREWARDREQUEST_MISSIONID_FIELD}
|
||||
TAKEARENABATTLEREWARDREQUEST.is_extendable = false
|
||||
TAKEARENABATTLEREWARDREQUEST.extensions = {}
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.name = "drop"
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.full_name = ".com.ljsd.jieling.protocols.TakeArenaBattleRewardResponse.drop"
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.number = 1
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.index = 0
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.label = 1
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.has_default_value = false
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.default_value = nil
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.message_type = CommonProto_pb.DROP
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.type = 11
|
||||
TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD.cpp_type = 10
|
||||
|
||||
TAKEARENABATTLEREWARDRESPONSE.name = "TakeArenaBattleRewardResponse"
|
||||
TAKEARENABATTLEREWARDRESPONSE.full_name = ".com.ljsd.jieling.protocols.TakeArenaBattleRewardResponse"
|
||||
TAKEARENABATTLEREWARDRESPONSE.nested_types = {}
|
||||
TAKEARENABATTLEREWARDRESPONSE.enum_types = {}
|
||||
TAKEARENABATTLEREWARDRESPONSE.fields = {TAKEARENABATTLEREWARDRESPONSE_DROP_FIELD}
|
||||
TAKEARENABATTLEREWARDRESPONSE.is_extendable = false
|
||||
TAKEARENABATTLEREWARDRESPONSE.extensions = {}
|
||||
|
||||
ArenaChallengeRequest = protobuf.Message(ARENACHALLENGEREQUEST)
|
||||
ArenaChallengeResponse = protobuf.Message(ARENACHALLENGERESPONSE)
|
||||
|
@ -814,4 +853,6 @@ GetArenaRankInfoRequest = protobuf.Message(GETARENARANKINFOREQUEST)
|
|||
GetArenaRankInfoResponse = protobuf.Message(GETARENARANKINFORESPONSE)
|
||||
PlayWithSbRequest = protobuf.Message(PLAYWITHSBREQUEST)
|
||||
PlayWithSbResponse = protobuf.Message(PLAYWITHSBRESPONSE)
|
||||
TakeArenaBattleRewardRequest = protobuf.Message(TAKEARENABATTLEREWARDREQUEST)
|
||||
TakeArenaBattleRewardResponse = protobuf.Message(TAKEARENABATTLEREWARDRESPONSE)
|
||||
|
||||
|
|
|
@ -204,6 +204,7 @@ ARENAINFO_FAILNUMS_FIELD = protobuf.FieldDescriptor();
|
|||
ARENAINFO_SUCCESSNUMS_FIELD = protobuf.FieldDescriptor();
|
||||
ARENAINFO_SCORE_FIELD = protobuf.FieldDescriptor();
|
||||
ARENAINFO_ARENAENEMYS_FIELD = protobuf.FieldDescriptor();
|
||||
ARENAINFO_HADTAKEBOX_FIELD = protobuf.FieldDescriptor();
|
||||
STOREITEM = protobuf.Descriptor();
|
||||
STOREITEM_ID_FIELD = protobuf.FieldDescriptor();
|
||||
STOREITEM_BUYNUM_FIELD = protobuf.FieldDescriptor();
|
||||
|
@ -2467,11 +2468,21 @@ ARENAINFO_ARENAENEMYS_FIELD.message_type = ARENAENEMY
|
|||
ARENAINFO_ARENAENEMYS_FIELD.type = 11
|
||||
ARENAINFO_ARENAENEMYS_FIELD.cpp_type = 10
|
||||
|
||||
ARENAINFO_HADTAKEBOX_FIELD.name = "hadTakeBox"
|
||||
ARENAINFO_HADTAKEBOX_FIELD.full_name = ".com.ljsd.jieling.protocols.ArenaInfo.hadTakeBox"
|
||||
ARENAINFO_HADTAKEBOX_FIELD.number = 5
|
||||
ARENAINFO_HADTAKEBOX_FIELD.index = 4
|
||||
ARENAINFO_HADTAKEBOX_FIELD.label = 3
|
||||
ARENAINFO_HADTAKEBOX_FIELD.has_default_value = false
|
||||
ARENAINFO_HADTAKEBOX_FIELD.default_value = {}
|
||||
ARENAINFO_HADTAKEBOX_FIELD.type = 5
|
||||
ARENAINFO_HADTAKEBOX_FIELD.cpp_type = 1
|
||||
|
||||
ARENAINFO.name = "ArenaInfo"
|
||||
ARENAINFO.full_name = ".com.ljsd.jieling.protocols.ArenaInfo"
|
||||
ARENAINFO.nested_types = {}
|
||||
ARENAINFO.enum_types = {}
|
||||
ARENAINFO.fields = {ARENAINFO_FAILNUMS_FIELD, ARENAINFO_SUCCESSNUMS_FIELD, ARENAINFO_SCORE_FIELD, ARENAINFO_ARENAENEMYS_FIELD}
|
||||
ARENAINFO.fields = {ARENAINFO_FAILNUMS_FIELD, ARENAINFO_SUCCESSNUMS_FIELD, ARENAINFO_SCORE_FIELD, ARENAINFO_ARENAENEMYS_FIELD, ARENAINFO_HADTAKEBOX_FIELD}
|
||||
ARENAINFO.is_extendable = false
|
||||
ARENAINFO.extensions = {}
|
||||
STOREITEM_ID_FIELD.name = "id"
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2c1656ad8650379438f47ed057d2712a
|
||||
timeCreated: 1555394495
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
|
|
@ -162,6 +162,7 @@ GETTRIALBOXREWARDREQUEST = protobuf.Descriptor();
|
|||
GETTRIALBOXREWARDREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
GETTRIALBOXREWARDRESPONSE = protobuf.Descriptor();
|
||||
GETTRIALBOXREWARDRESPONSE_BOXDROP_FIELD = protobuf.FieldDescriptor();
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD = protobuf.FieldDescriptor();
|
||||
USEADDHPITEMREQUEST = protobuf.Descriptor();
|
||||
USEADDHPITEMREQUEST_HEROID_FIELD = protobuf.FieldDescriptor();
|
||||
MAPGAMERESPONSE = protobuf.Descriptor();
|
||||
|
@ -1650,11 +1651,21 @@ GETTRIALBOXREWARDRESPONSE_BOXDROP_FIELD.message_type = CommonProto_pb.DROP
|
|||
GETTRIALBOXREWARDRESPONSE_BOXDROP_FIELD.type = 11
|
||||
GETTRIALBOXREWARDRESPONSE_BOXDROP_FIELD.cpp_type = 10
|
||||
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.name = "buffIds"
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.full_name = ".com.ljsd.jieling.protocols.GetTrialBoxRewardResponse.buffIds"
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.number = 2
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.index = 1
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.label = 3
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.has_default_value = false
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.default_value = {}
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.type = 5
|
||||
GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD.cpp_type = 1
|
||||
|
||||
GETTRIALBOXREWARDRESPONSE.name = "GetTrialBoxRewardResponse"
|
||||
GETTRIALBOXREWARDRESPONSE.full_name = ".com.ljsd.jieling.protocols.GetTrialBoxRewardResponse"
|
||||
GETTRIALBOXREWARDRESPONSE.nested_types = {}
|
||||
GETTRIALBOXREWARDRESPONSE.enum_types = {}
|
||||
GETTRIALBOXREWARDRESPONSE.fields = {GETTRIALBOXREWARDRESPONSE_BOXDROP_FIELD}
|
||||
GETTRIALBOXREWARDRESPONSE.fields = {GETTRIALBOXREWARDRESPONSE_BOXDROP_FIELD, GETTRIALBOXREWARDRESPONSE_BUFFIDS_FIELD}
|
||||
GETTRIALBOXREWARDRESPONSE.is_extendable = false
|
||||
GETTRIALBOXREWARDRESPONSE.extensions = {}
|
||||
USEADDHPITEMREQUEST_HEROID_FIELD.name = "heroId"
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -161,9 +161,10 @@ function this.SingleHelpDataShow(go,data)
|
|||
Util.AddOnceClick(getRewardBtn, function()
|
||||
NetManager.GuildTakeHelpRewardRequest(data.type,function(msg)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function ()
|
||||
MyGuildManager.SetMyAidInfoHadtakenum(data.type,data.num - data.hadtakenum)
|
||||
this.ShowPanelData()
|
||||
|
||||
end)
|
||||
MyGuildManager.SetMyAidInfoHadtakenum(data.type,data.num - data.hadtakenum)
|
||||
this.ShowPanelData()
|
||||
end)
|
||||
end)
|
||||
else
|
||||
|
|
|
@ -531,6 +531,7 @@ end
|
|||
-- 被提出公会
|
||||
function MyGuildManager.BeKickOut(msg)
|
||||
-- uid 为0表示公会解散
|
||||
LogPink("msg.uid "..msg.uid)
|
||||
if msg.uid == PlayerManager.uid or msg.uid == 0 then
|
||||
PlayerManager.familyId = 0
|
||||
this.MyGuildInfo = nil
|
||||
|
@ -558,8 +559,9 @@ function MyGuildManager.BeKickOut(msg)
|
|||
local rMem = table.remove(this.MyGuildMemList, rIndex)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.KickOut, rMem.roleUid)
|
||||
end
|
||||
LogPink("msg.uid "..msg.uid)
|
||||
--清除援助信息
|
||||
MyGuildManager.DelSingleGuildHelpInfo(msg.uid)
|
||||
-- MyGuildManager.DelSingleGuildHelpInfo(msg.uid)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -648,23 +650,27 @@ end
|
|||
--初始化工会援助所有信息
|
||||
function MyGuildManager.SetAllGuildHelpInfo(msg)
|
||||
for i = 1, #msg.guildHelpInfoIndication do
|
||||
local singleHelpInfo = {}
|
||||
singleHelpInfo.uid = msg.guildHelpInfoIndication[i].uid
|
||||
singleHelpInfo.name = msg.guildHelpInfoIndication[i].name
|
||||
singleHelpInfo.guildHelpInfo = {}
|
||||
for j = 1, #msg.guildHelpInfoIndication[i].guildHelpInfo do
|
||||
table.insert(singleHelpInfo.guildHelpInfo,{type = msg.guildHelpInfoIndication[i].guildHelpInfo[j].type,--碎片id
|
||||
num = msg.guildHelpInfoIndication[i].guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||
if msg.guildHelpInfoIndication[i].uid and msg.guildHelpInfoIndication[i].uid > 0 then
|
||||
local singleHelpInfo = {}
|
||||
singleHelpInfo.uid = msg.guildHelpInfoIndication[i].uid
|
||||
singleHelpInfo.name = msg.guildHelpInfoIndication[i].name
|
||||
singleHelpInfo.guildHelpInfo = {}
|
||||
for j = 1, #msg.guildHelpInfoIndication[i].guildHelpInfo do
|
||||
if msg.guildHelpInfoIndication[i].guildHelpInfo[j].num ~= -1 then
|
||||
table.insert(singleHelpInfo.guildHelpInfo,{type = msg.guildHelpInfoIndication[i].guildHelpInfo[j].type,--碎片id
|
||||
num = msg.guildHelpInfoIndication[i].guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = msg.guildHelpInfoIndication[i].guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||
end
|
||||
end
|
||||
-- LogRed(" msg.guildHelpInfoIndication[i].uid ".. msg.guildHelpInfoIndication[i].uid)
|
||||
this.allGuildHelpInfo[msg.guildHelpInfoIndication[i].uid] = singleHelpInfo
|
||||
end
|
||||
-- LogRed(" msg.guildHelpInfoIndication[i].uid ".. msg.guildHelpInfoIndication[i].uid)
|
||||
this.allGuildHelpInfo[msg.guildHelpInfoIndication[i].uid] = singleHelpInfo
|
||||
end
|
||||
MyGuildManager.RefreshAidRedPot()
|
||||
end
|
||||
--当公会成员退出时清除求援信息
|
||||
function MyGuildManager.DelSingleGuildHelpInfo(Deluid)
|
||||
LogGreen("DelSingleGuildHelpInfo "..Deluid)
|
||||
-- LogGreen("DelSingleGuildHelpInfo "..Deluid)
|
||||
for uid, value in pairs(this.allGuildHelpInfo) do
|
||||
if uid == Deluid then
|
||||
this.allGuildHelpInfo[uid] = nil
|
||||
|
@ -687,11 +693,15 @@ function MyGuildManager.SetSingleGuildHelpInfo(msg)
|
|||
this.allGuildHelpInfo[uid].guildHelpInfo = {}
|
||||
-- LogGreen("msg.guildHelpInfo "..#msg.guildHelpInfo)
|
||||
for j = 1, #msg.guildHelpInfo do
|
||||
LogGreen(Language[10996]..msg.uid.." "..msg.guildHelpInfo[j].type.." "..msg.guildHelpInfo[j].num.." "..msg.guildHelpInfo[j].hadtakenum)
|
||||
-- LogGreen(Language[10996]..msg.uid.." "..msg.guildHelpInfo[j].type.." "..msg.guildHelpInfo[j].num.." "..msg.guildHelpInfo[j].hadtakenum)
|
||||
if msg.guildHelpInfo[j].num ~= -1 then
|
||||
table.insert(this.allGuildHelpInfo[uid].guildHelpInfo,{type = msg.guildHelpInfo[j].type,--碎片id
|
||||
num = msg.guildHelpInfo[j].num,--总获得数量
|
||||
hadtakenum = msg.guildHelpInfo[j].hadtakenum, })--已领取数量
|
||||
else
|
||||
if this.allGuildHelpInfo[uid] then
|
||||
this.allGuildHelpInfo[uid] = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -159,6 +159,7 @@ function this:AddListener()
|
|||
Game.GlobalEvent:AddEvent(GameEvent.Map.Out, this.OnMapOut)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Map.DeadOut, this.OnMapDeadOut)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Map.MapDataChange, this.OnMapDataChange)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Map.StopWalk, this.StopWalking)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.RefreshBuffShow)
|
||||
|
||||
missionView.AddListener()
|
||||
|
@ -177,6 +178,7 @@ function this:RemoveListener()
|
|||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.Out, this.OnMapOut)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.DeadOut, this.OnMapDeadOut)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.MapDataChange, this.OnMapDataChange)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Map.StopWalk, this.StopWalking)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.FoodBuff.OnFoodBuffStateChanged, this.RefreshBuffShow)
|
||||
|
||||
missionView.RemoveListener()
|
||||
|
|
|
@ -93,6 +93,8 @@ function this:OnShow()
|
|||
end
|
||||
|
||||
function this.SetSelectHero()
|
||||
local itemId=trialSetting[1].HealingId[1]
|
||||
local itemNum=trialSetting[1].HealingId[2]
|
||||
if _LiveName then
|
||||
poolManager:UnLoadLive(_LiveName, _LiveNode)
|
||||
end
|
||||
|
|
|
@ -300,11 +300,13 @@ end
|
|||
-- 直接战斗
|
||||
local directFight = function(showType, eventId, showValues, options)
|
||||
local monsterGroupId = options[1]
|
||||
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.StopWalk)
|
||||
--获取自动战斗
|
||||
local t=(PlayerPrefs.HasKey(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..1)
|
||||
and PlayerPrefs.GetInt(PlayerManager.uid.."GeneralPopup_TrialSettingBtn"..1)==1) and 1 or 0
|
||||
if t==0 then --CarbonManager.isPassFight
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.ShowEnemyInfo,monsterGroupId,eventId,showValues)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.Map.ShowEnemyInfo, monsterGroupId,eventId,showValues)
|
||||
else
|
||||
for i, v in ipairs(MapManager.trialHeroInfo) do
|
||||
if MapTrialManager.selectHeroDid==v.heroId then
|
||||
|
@ -333,7 +335,6 @@ local directFight = function(showType, eventId, showValues, options)
|
|||
-- --召唤Boss
|
||||
if CarbonManager.difficulty == CARBON_TYPE.TRIAL and MapTrialManager.powerValue >= 100 then
|
||||
MapTrialManager.isHaveBoss = true
|
||||
LogGreen("召唤boss的更新精气值"..MapTrialManager.powerValue)
|
||||
MapTrialManager.UpdatePowerValue(0)
|
||||
end
|
||||
end)
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue