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

This commit is contained in:
chenxi 2023-04-11 14:32:02 +08:00
commit 17983882c3
14 changed files with 258 additions and 246 deletions

View File

@ -79,126 +79,6 @@ local hero = {
["model_id"]="p00002",
["icon"]="2"
},
[32001]={
["position"]=3,
["qlt"]=2,
["base_skill"]=10,
["rouge_skill_1"]=200101,
["rouge_skill_2"]=200102,
["rouge_skill_3"]=200103,
["hp_1"]=100,
["hp_2"]=110,
["hp_3"]=120,
["hp_4"]=130,
["hp_5"]=140,
["hp_6"]=150,
["hp_7"]=160,
["hp_8"]=170,
["hp_9"]=180,
["hp_10"]=190,
["hp_11"]=200,
["hp_12"]=210,
["hp_13"]=220,
["hp_14"]=230,
["hp_15"]=240,
["atk_1"]=100,
["atk_2"]=110,
["atk_3"]=120,
["atk_4"]=130,
["atk_5"]=140,
["atk_6"]=150,
["atk_7"]=160,
["atk_8"]=170,
["atk_9"]=180,
["atk_10"]=190,
["atk_11"]=200,
["atk_12"]=210,
["atk_13"]=220,
["atk_14"]=230,
["atk_15"]=240,
["model_id"]="p00003",
["icon"]="3"
},
[42001]={
["position"]=4,
["qlt"]=2,
["base_skill"]=30,
["rouge_skill_1"]=200301,
["rouge_skill_2"]=200302,
["rouge_skill_3"]=200303,
["hp_1"]=100,
["hp_2"]=110,
["hp_3"]=120,
["hp_4"]=130,
["hp_5"]=140,
["hp_6"]=150,
["hp_7"]=160,
["hp_8"]=170,
["hp_9"]=180,
["hp_10"]=190,
["hp_11"]=200,
["hp_12"]=210,
["hp_13"]=220,
["hp_14"]=230,
["hp_15"]=240,
["atk_1"]=100,
["atk_2"]=110,
["atk_3"]=120,
["atk_4"]=130,
["atk_5"]=140,
["atk_6"]=150,
["atk_7"]=160,
["atk_8"]=170,
["atk_9"]=180,
["atk_10"]=190,
["atk_11"]=200,
["atk_12"]=210,
["atk_13"]=220,
["atk_14"]=230,
["atk_15"]=240,
["model_id"]="p00004",
["icon"]="4"
},
[52001]={
["position"]=5,
["qlt"]=2,
["base_skill"]=40,
["rouge_skill_1"]=200401,
["rouge_skill_2"]=200402,
["rouge_skill_3"]=200403,
["hp_1"]=100,
["hp_2"]=110,
["hp_3"]=120,
["hp_4"]=130,
["hp_5"]=140,
["hp_6"]=150,
["hp_7"]=160,
["hp_8"]=170,
["hp_9"]=180,
["hp_10"]=190,
["hp_11"]=200,
["hp_12"]=210,
["hp_13"]=220,
["hp_14"]=230,
["hp_15"]=240,
["atk_1"]=100,
["atk_2"]=110,
["atk_3"]=120,
["atk_4"]=130,
["atk_5"]=140,
["atk_6"]=150,
["atk_7"]=160,
["atk_8"]=170,
["atk_9"]=180,
["atk_10"]=190,
["atk_11"]=200,
["atk_12"]=210,
["atk_13"]=220,
["atk_14"]=230,
["atk_15"]=240,
["model_id"]="p00005",
["icon"]="5"
},
[23001]={
["position"]=2,
["qlt"]=3,
@ -239,6 +119,46 @@ local hero = {
["model_id"]="p00006",
["icon"]="6"
},
[32001]={
["position"]=3,
["qlt"]=2,
["base_skill"]=10,
["rouge_skill_1"]=200101,
["rouge_skill_2"]=200102,
["rouge_skill_3"]=200103,
["hp_1"]=100,
["hp_2"]=110,
["hp_3"]=120,
["hp_4"]=130,
["hp_5"]=140,
["hp_6"]=150,
["hp_7"]=160,
["hp_8"]=170,
["hp_9"]=180,
["hp_10"]=190,
["hp_11"]=200,
["hp_12"]=210,
["hp_13"]=220,
["hp_14"]=230,
["hp_15"]=240,
["atk_1"]=100,
["atk_2"]=110,
["atk_3"]=120,
["atk_4"]=130,
["atk_5"]=140,
["atk_6"]=150,
["atk_7"]=160,
["atk_8"]=170,
["atk_9"]=180,
["atk_10"]=190,
["atk_11"]=200,
["atk_12"]=210,
["atk_13"]=220,
["atk_14"]=230,
["atk_15"]=240,
["model_id"]="p00003",
["icon"]="3"
},
[33001]={
["position"]=3,
["qlt"]=3,
@ -279,6 +199,46 @@ local hero = {
["model_id"]="p00007",
["icon"]="7"
},
[42001]={
["position"]=4,
["qlt"]=2,
["base_skill"]=30,
["rouge_skill_1"]=200301,
["rouge_skill_2"]=200302,
["rouge_skill_3"]=200303,
["hp_1"]=100,
["hp_2"]=110,
["hp_3"]=120,
["hp_4"]=130,
["hp_5"]=140,
["hp_6"]=150,
["hp_7"]=160,
["hp_8"]=170,
["hp_9"]=180,
["hp_10"]=190,
["hp_11"]=200,
["hp_12"]=210,
["hp_13"]=220,
["hp_14"]=230,
["hp_15"]=240,
["atk_1"]=100,
["atk_2"]=110,
["atk_3"]=120,
["atk_4"]=130,
["atk_5"]=140,
["atk_6"]=150,
["atk_7"]=160,
["atk_8"]=170,
["atk_9"]=180,
["atk_10"]=190,
["atk_11"]=200,
["atk_12"]=210,
["atk_13"]=220,
["atk_14"]=230,
["atk_15"]=240,
["model_id"]="p00004",
["icon"]="4"
},
[43001]={
["position"]=4,
["qlt"]=3,
@ -318,6 +278,46 @@ local hero = {
["atk_15"]=360,
["model_id"]="p00008",
["icon"]="8"
},
[52001]={
["position"]=5,
["qlt"]=2,
["base_skill"]=40,
["rouge_skill_1"]=200401,
["rouge_skill_2"]=200402,
["rouge_skill_3"]=200403,
["hp_1"]=100,
["hp_2"]=110,
["hp_3"]=120,
["hp_4"]=130,
["hp_5"]=140,
["hp_6"]=150,
["hp_7"]=160,
["hp_8"]=170,
["hp_9"]=180,
["hp_10"]=190,
["hp_11"]=200,
["hp_12"]=210,
["hp_13"]=220,
["hp_14"]=230,
["hp_15"]=240,
["atk_1"]=100,
["atk_2"]=110,
["atk_3"]=120,
["atk_4"]=130,
["atk_5"]=140,
["atk_6"]=150,
["atk_7"]=160,
["atk_8"]=170,
["atk_9"]=180,
["atk_10"]=190,
["atk_11"]=200,
["atk_12"]=210,
["atk_13"]=220,
["atk_14"]=230,
["atk_15"]=240,
["model_id"]="p00005",
["icon"]="5"
}
}
local config = {

View File

@ -14,7 +14,8 @@ local skill_hero = {
["range"]=1
}
},
["icon"]=10
["icon"]=10,
["battle_icon"]=1
},
[20]={
["energy"]=10,
@ -30,12 +31,13 @@ local skill_hero = {
}
},
["obj"]=2,
["icon"]=20
["icon"]=20,
["battle_icon"]=2
},
[21]={
["energy"]=10,
["position"]=2,
["method"]=2,
["method"]=1,
["skill_type"]=2,
["skill_type_parameter"]=2,
["boardrange"]={
@ -64,7 +66,8 @@ local skill_hero = {
["round"]=0
}
},
["icon"]=20
["icon"]=20,
["battle_icon"]=2
},
[30]={
["energy"]=10,
@ -77,7 +80,8 @@ local skill_hero = {
["range"]=2
}
},
["icon"]=30
["icon"]=30,
["battle_icon"]=3
},
[40]={
["energy"]=10,
@ -93,7 +97,8 @@ local skill_hero = {
}
},
["obj"]=1,
["icon"]=40
["icon"]=40,
["battle_icon"]=4
},
[50]={
["energy"]=10,
@ -110,7 +115,8 @@ local skill_hero = {
["range"]=2
}
},
["icon"]=50
["icon"]=50,
["battle_icon"]=5
},
[60]={
["energy"]=10,
@ -126,7 +132,8 @@ local skill_hero = {
}
},
["obj"]=1,
["icon"]=60
["icon"]=60,
["battle_icon"]=6
},
[70]={
["energy"]=10,
@ -142,7 +149,8 @@ local skill_hero = {
}
},
["obj"]=1,
["icon"]=70
["icon"]=70,
["battle_icon"]=7
},
[71]={
["energy"]=10,
@ -177,7 +185,8 @@ local skill_hero = {
}
},
["obj"]=1,
["icon"]=70
["icon"]=70,
["battle_icon"]=7
},
[72]={
["energy"]=10,
@ -219,7 +228,8 @@ local skill_hero = {
["range"]=1
}
},
["icon"]=70
["icon"]=70,
["battle_icon"]=7
},
[80]={
["energy"]=10,
@ -240,7 +250,8 @@ local skill_hero = {
["round"]=1
}
},
["icon"]=80
["icon"]=80,
["battle_icon"]=8
},
[81]={
["energy"]=10,
@ -279,7 +290,8 @@ local skill_hero = {
["round"]=1
}
},
["icon"]=80
["icon"]=80,
["battle_icon"]=8
}
}
local config = {

View File

@ -1,27 +1,27 @@
local hero = {
[12001]={
["name"]="王八拳"
["name"]="洛克西"
},
[22001]={
["name"]="无影腿"
},
[32001]={
["name"]="闪电鞭"
},
[42001]={
["name"]="金钟罩"
},
[52001]={
["name"]="大鹏展翅"
["name"]="卡拉"
},
[23001]={
["name"]="丹田吐纳"
["name"]="巨剑罗伯特"
},
[32001]={
["name"]="阿斯克"
},
[33001]={
["name"]="疾风骤雨"
["name"]="艾芙琳"
},
[42001]={
["name"]="莉莉丝"
},
[43001]={
["name"]="寒冰掌"
["name"]="白发凯瑟琳"
},
[52001]={
["name"]="艾伦"
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {

View File

@ -4,24 +4,24 @@ local hero = {
},
[22001]={
},
[32001]={
},
[42001]={
},
[52001]={
},
[23001]={
},
[32001]={
},
[33001]={
},
[42001]={
},
[43001]={
},
[52001]={
}
}
local config = {