boss界面模型比例适配

This commit is contained in:
Fang 2023-05-26 18:39:07 +08:00
parent b57318f3a6
commit 0288f2a300
25 changed files with 1789 additions and 1897 deletions

View File

@ -98,6 +98,7 @@ function ConfigManager:preLoadConfig()
monsterFullData[k].model_id = data.model_id
monsterFullData[k].hurt_num = data.hurt_num
monsterFullData[k].body = data.body
monsterFullData[k].model_ui = data.model_ui
-- else
-- Logger.logHighlight("not data monster_baseid = " .. v.monster_baseid)
end

File diff suppressed because it is too large Load Diff

View File

@ -105,13 +105,13 @@ local const = {
["value"]=57600
},
["idle_exp_drop_time"]={
["value"]=1200
["value"]=600
},
["idle_gold_drop_time"]={
["value"]=1200
["value"]=600
},
["idle_item_drop_time"]={
["value"]=1200
["value"]=600
},
["idle_drop_fast_times_1"]={
["value"]=2
@ -188,9 +188,12 @@ local const = {
},
["act_sevenday_time"]={
["value"]=7
},
["model_daily_challenge"]={
["value"]=8000
}
}
local config = {
data=const,count=40
data=const,count=41
}
return config

View File

@ -19,12 +19,12 @@ local hero = {
["rouge_skill_7"]=1200107,
["begin_lv"]=1,
["hp"]={
2000000000,
2400000000,
2000000,
2400000,
2800000,
3220000,
3660000000,
4120000000,
3660000,
4120000,
4620000,
5160000,
5760000,
@ -40,7 +40,7 @@ local hero = {
1200000,
1400000,
1610000,
18300000,
1830000,
2060000,
2310000,
2580000,
@ -53,7 +53,7 @@ local hero = {
5490000
},
["model_id"]="p0005",
["icon"]="5",
["icon"]="1",
["item_id"]=12001,
["unlock_chapter"]=1
},
@ -111,7 +111,7 @@ local hero = {
5490000
},
["model_id"]="p0014",
["icon"]="5",
["icon"]="6",
["item_id"]=13001,
["unlock_chapter"]=3,
["is_show"]=1
@ -170,7 +170,7 @@ local hero = {
5490000
},
["model_id"]="p0009",
["icon"]="5",
["icon"]="11",
["item_id"]=13002,
["unlock_chapter"]=3,
["is_show"]=1
@ -229,7 +229,7 @@ local hero = {
5490000
},
["model_id"]="p0011",
["icon"]="5",
["icon"]="16",
["item_id"]=14001,
["unlock_chapter"]=3,
["is_show"]=1
@ -346,7 +346,7 @@ local hero = {
5490000
},
["model_id"]="p0010",
["icon"]="5",
["icon"]="12",
["item_id"]=23001,
["unlock_chapter"]=3,
["is_show"]=1
@ -405,7 +405,7 @@ local hero = {
5490000
},
["model_id"]="p0012",
["icon"]="5",
["icon"]="7",
["item_id"]=23002,
["unlock_chapter"]=3,
["is_show"]=1
@ -464,7 +464,7 @@ local hero = {
5490000
},
["model_id"]="p0007",
["icon"]="7",
["icon"]="17",
["item_id"]=24001,
["unlock_chapter"]=3,
["is_show"]=1
@ -523,7 +523,7 @@ local hero = {
5490000
},
["model_id"]="p0001",
["icon"]="1",
["icon"]="3",
["item_id"]=32001,
["unlock_chapter"]=1
},
@ -581,7 +581,7 @@ local hero = {
5490000
},
["model_id"]="p0006",
["icon"]="6",
["icon"]="8",
["item_id"]=33001,
["unlock_chapter"]=3,
["is_show"]=1
@ -639,8 +639,8 @@ local hero = {
4920000,
5490000
},
["model_id"]="p0006",
["icon"]="6",
["model_id"]="p0020",
["icon"]="13",
["item_id"]=33002,
["unlock_chapter"]=3,
["is_show"]=1
@ -698,8 +698,8 @@ local hero = {
4920000,
5490000
},
["model_id"]="p0006",
["icon"]="6",
["model_id"]="p0016",
["icon"]="18",
["item_id"]=34001,
["unlock_chapter"]=3,
["is_show"]=1
@ -758,7 +758,7 @@ local hero = {
5490000
},
["model_id"]="p0003",
["icon"]="3",
["icon"]="4",
["item_id"]=42001,
["unlock_chapter"]=1
},
@ -815,8 +815,8 @@ local hero = {
4920000,
5490000
},
["model_id"]="p0003",
["icon"]="3",
["model_id"]="p0022",
["icon"]="9",
["item_id"]=43001,
["unlock_chapter"]=3,
["is_show"]=1
@ -875,7 +875,7 @@ local hero = {
5490000
},
["model_id"]="p0003",
["icon"]="3",
["icon"]="14",
["item_id"]=43002,
["unlock_chapter"]=3,
["is_show"]=1
@ -934,7 +934,7 @@ local hero = {
5490000
},
["model_id"]="p0008",
["icon"]="8",
["icon"]="19",
["item_id"]=44001,
["unlock_chapter"]=3,
["is_show"]=1
@ -993,7 +993,7 @@ local hero = {
5490000
},
["model_id"]="p0004",
["icon"]="4",
["icon"]="5",
["item_id"]=52001,
["unlock_chapter"]=1
},
@ -1051,7 +1051,7 @@ local hero = {
5490000
},
["model_id"]="p0015",
["icon"]="4",
["icon"]="10",
["item_id"]=53001,
["unlock_chapter"]=3,
["is_show"]=1
@ -1110,7 +1110,7 @@ local hero = {
5490000
},
["model_id"]="p0004",
["icon"]="4",
["icon"]="15",
["item_id"]=53002,
["unlock_chapter"]=3,
["is_show"]=1
@ -1169,7 +1169,7 @@ local hero = {
5490000
},
["model_id"]="p0004",
["icon"]="4",
["icon"]="20",
["item_id"]=54001,
["unlock_chapter"]=3,
["is_show"]=1

View File

@ -1,414 +1,546 @@
local monster_base = {
[10001]={
["model_id"]="m10001",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10002]={
["model_id"]="m10002",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10003]={
["model_id"]="m10003",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10004]={
["model_id"]="m10004",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10005]={
["model_id"]="m10005",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10006]={
["model_id"]="m10006",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10007]={
["model_id"]="m10007",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10008]={
["model_id"]="m10008",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10009]={
["model_id"]="m10009",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10010]={
["model_id"]="m10010",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10012]={
["model_id"]="m10012",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10013]={
["model_id"]="m10013",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10014]={
["model_id"]="m10014",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10015]={
["model_id"]="m10015",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10016]={
["model_id"]="m10016",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10017]={
["model_id"]="m10017",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10018]={
["model_id"]="m10018",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10019]={
["model_id"]="m10019",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10020]={
["model_id"]="m10020",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10021]={
["model_id"]="m10021",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10022]={
["model_id"]="m10022",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10023]={
["model_id"]="m10023",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10024]={
["model_id"]="m10024",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10025]={
["model_id"]="m10025",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10026]={
["model_id"]="m10026",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10027]={
["model_id"]="m10027",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10028]={
["model_id"]="m10028",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10029]={
["model_id"]="m10029",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10030]={
["model_id"]="m10030",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10031]={
["model_id"]="m10031",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10032]={
["model_id"]="m10032",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10033]={
["model_id"]="m10033",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10034]={
["model_id"]="m10034",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10035]={
["model_id"]="m10035",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10036]={
["model_id"]="m10036",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10037]={
["model_id"]="m10037",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10038]={
["model_id"]="m10038",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10039]={
["model_id"]="m10039",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10040]={
["model_id"]="m10040",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10041]={
["model_id"]="m10041",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10042]={
["model_id"]="m10042",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10043]={
["model_id"]="m10043",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10044]={
["model_id"]="m10044",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10045]={
["model_id"]="m10045",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10046]={
["model_id"]="m10046",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10047]={
["model_id"]="m10047",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10048]={
["model_id"]="m10048",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10049]={
["model_id"]="m10049",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10050]={
["model_id"]="m10050",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10051]={
["model_id"]="m10051",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10052]={
["model_id"]="m10052",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10053]={
["model_id"]="m10053",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10054]={
["model_id"]="m10054",
["body"]=3
["body"]=3,
["model_ui"]=1.0
},
[10055]={
["model_id"]="m10055",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10056]={
["model_id"]="m10056",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10057]={
["model_id"]="m10057",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10058]={
["model_id"]="m10058",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[10059]={
["model_id"]="m10059",
["body"]=2
["body"]=2,
["model_ui"]=1.0
},
[20001]={
["model_id"]="m20001",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20002]={
["model_id"]="m20002",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20003]={
["model_id"]="m20003",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20004]={
["model_id"]="m20004",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20005]={
["model_id"]="m20005",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20006]={
["model_id"]="m20006",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20007]={
["model_id"]="m20007",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20008]={
["model_id"]="m20008",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20009]={
["model_id"]="m20009",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20010]={
["model_id"]="m20010",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20011]={
["model_id"]="m20011",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20012]={
["model_id"]="m20012",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20013]={
["model_id"]="m20013",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20014]={
["model_id"]="m20014",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20015]={
["model_id"]="m20015",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20016]={
["model_id"]="m20016",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20017]={
["model_id"]="m20017",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20018]={
["model_id"]="m20018",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20019]={
["model_id"]="m20019",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20020]={
["model_id"]="m20020",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20021]={
["model_id"]="m20021",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20022]={
["model_id"]="m20022",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20023]={
["model_id"]="m20023",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20024]={
["model_id"]="m20024",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20025]={
["model_id"]="m20025",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20026]={
["model_id"]="m20026",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20027]={
["model_id"]="m20027",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20028]={
["model_id"]="m20028",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20029]={
["model_id"]="m20029",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20030]={
["model_id"]="m20030",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20031]={
["model_id"]="m20031",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[20032]={
["model_id"]="m20032",
["body"]=1
["body"]=1,
["model_ui"]=1.0
},
[30001]={
["model_id"]="p0001",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30002]={
["model_id"]="p0002",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30003]={
["model_id"]="p0003",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30004]={
["model_id"]="p0004",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30005]={
["model_id"]="p0005",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30006]={
["model_id"]="p0006",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30007]={
["model_id"]="p0007",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30008]={
["model_id"]="p0008",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30009]={
["model_id"]="p0009",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30010]={
["model_id"]="p0010",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30011]={
["model_id"]="p0011",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30012]={
["model_id"]="p0012",
["body"]=2,
["model_ui"]=1.0
},
[30014]={
["model_id"]="p0014",
["body"]=1
["body"]=2,
["model_ui"]=1.0
},
[30015]={
["model_id"]="p0015",
["body"]=2,
["model_ui"]=1.0
},
[30016]={
["model_id"]="p0016",
["body"]=2,
["model_ui"]=1.0
},
[30017]={
["model_id"]="p0017",
["body"]=2,
["model_ui"]=1.0
},
[30020]={
["model_id"]="p0020",
["body"]=2,
["model_ui"]=1.0
},
[30022]={
["model_id"]="p0022",
["body"]=2,
["model_ui"]=1.0
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -1142,7 +1142,7 @@ local monster_chapter = {
["monster_exp"]=17000
},
[9001]={
["monster_base"]=30003,
["monster_base"]=30022,
["is_boss"]=2,
["hp"]=108900000,
["atk"]=1070000,
@ -1909,7 +1909,7 @@ local monster_chapter = {
["monster_exp"]=17000
},
[15001]={
["monster_base"]=30006,
["monster_base"]=30012,
["is_boss"]=2,
["hp"]=145500000,
["atk"]=1480000,
@ -5328,7 +5328,7 @@ local monster_chapter = {
["monster_exp"]=17000
},
[41001]={
["monster_base"]=30005,
["monster_base"]=30015,
["is_boss"]=2,
["hp"]=195000000,
["atk"]=2000000,

View File

@ -200,7 +200,7 @@ local skill = {
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=1200120,
["name_act"]="attack04",
["name_act"]="skill01",
["fx_self"]=300020,
["fx_target"]=2,
["fx_target_delay"]=900
@ -525,7 +525,7 @@ local skill = {
["type"]="normal_attack_add",
["num"]=2,
["ratio"]=10000,
["round"]=2
["round"]=3
}
},
["obj"]=1
@ -1185,11 +1185,7 @@ local skill = {
["energy"]=10,
["link"]=1,
["position"]=2,
["method"]=2,
["skill_type"]=4,
["boardrange"]={
},
["method"]=1,
["battle_icon"]="2",
["effect_type"]=1,
["trigger"]=1,
@ -1263,6 +1259,56 @@ local skill = {
["obj"]=1,
["skill_position"]=2
},
[2200123]={
["energy"]=10,
["link"]=1,
["position"]=2,
["method"]=2,
["skill_type"]=4,
["boardrange"]={
{
["type"]=1,
["range"]=1
},
{
["type"]=2,
["range"]=1
},
{
["type"]=3,
["range"]=1
},
{
["type"]=4,
["range"]=1
}
},
["battle_icon"]="2",
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt_yellow",
["num"]=40000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]=2,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=2200120,
["name_act"]="skill01",
["fx_self"]=300008,
["fx_target"]=4,
["fx_target_delay"]=1100,
["bullet_time"]={
1100,
3000,
400
}
},
[2300110]={
["position"]=2,
["effect_type"]=1,
@ -2426,7 +2472,7 @@ local skill = {
["type"]="skill_hurt_add",
["num"]=1500,
["ratio"]=10000,
["round"]=2
["round"]=3
}
},
["obj"]=1
@ -2440,7 +2486,7 @@ local skill = {
["type"]="skill_hurt_add",
["num"]=1500,
["ratio"]=10000,
["round"]=3
["round"]=4
}
},
["obj"]=1
@ -4613,7 +4659,7 @@ local skill = {
["obj"]=1,
["skill_position"]=2,
["cd"]=2,
["cd_start"]=1,
["cd_start"]=0,
["sound_hit"]=3300120,
["name_act"]="skill01",
["fx_self"]=200011
@ -4632,7 +4678,7 @@ local skill = {
["obj"]=2,
["skill_position"]=1,
["cd"]=2,
["cd_start"]=2,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
@ -4664,7 +4710,7 @@ local skill = {
["obj"]=2,
["skill_position"]=1,
["cd"]=3,
["cd_start"]=2,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
@ -4705,7 +4751,7 @@ local skill = {
},
["skill_position"]=1,
["cd"]=2,
["cd_start"]=2,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
@ -4737,7 +4783,7 @@ local skill = {
["obj"]=2,
["skill_position"]=1,
["cd"]=3,
["cd_start"]=2,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
@ -4769,7 +4815,7 @@ local skill = {
["obj"]=2,
["skill_position"]=1,
["cd"]=3,
["cd_start"]=2,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
@ -4801,7 +4847,7 @@ local skill = {
["obj"]=2,
["skill_position"]=2,
["cd"]=3,
["cd_start"]=1,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=6,
["sound_hit"]=4200120,
@ -4827,7 +4873,7 @@ local skill = {
["obj"]=1,
["skill_position"]=2,
["cd"]=3,
["cd_start"]=1
["cd_start"]=0
},
[10023]={
["skill_type"]=3,
@ -4848,7 +4894,7 @@ local skill = {
["obj"]=2,
["skill_position"]=1,
["cd"]=2,
["cd_start"]=2,
["cd_start"]=0,
["shake_time"]=200,
["shake_type"]=5,
["sound_hit"]=10082,
@ -5351,7 +5397,7 @@ local skill = {
},
["obj"]=1,
["cd"]=3,
["cd_start"]=2,
["cd_start"]=0,
["sound_hit"]=3300120,
["name_act"]="skill01",
["fx_self"]=300025
@ -11482,6 +11528,6 @@ local skill = {
}
}
local config = {
data=skill,count=551
data=skill,count=552
}
return config

View File

@ -737,6 +737,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=3,
["icon"]="44"
},
[1200104]={
@ -782,7 +783,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=1,
["obj"]=3,
["icon"]="45"
},
[1200106]={
@ -821,7 +822,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=1,
["obj"]=3,
["icon"]="45"
},
[1300100]={
@ -913,7 +914,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=8,
["obj"]=3,
["icon"]="45"
},
[1300106]={
@ -935,7 +936,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=8,
["obj"]=3,
["icon"]="45"
},
[1300107]={
@ -1233,26 +1234,11 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=2,
["skill_position"]=2,
["boardrange"]={
{
["type"]=1,
["range"]=1
},
{
["type"]=2,
["range"]=1
},
{
["type"]=3,
["range"]=1
},
{
["type"]=4,
["range"]=1
}
["parameter"]={
2200123
},
["skill_position"]=2,
["icon"]="34"
},
[2200103]={
@ -1307,6 +1293,7 @@ local skill_rogue = {
["icon"]="36"
},
[2200106]={
["unlock"]=2200102,
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
@ -1752,7 +1739,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=2,
["obj"]=4,
["icon"]="51"
},
[3200100]={
@ -1890,12 +1877,12 @@ local skill_rogue = {
["effect"]={
{
["type"]="block",
["num"]=1000,
["num"]=5000,
["ratio"]=10000,
["round"]=2
}
},
["obj"]=8,
["obj"]=5,
["icon"]="33"
},
[3300100]={
@ -1975,7 +1962,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=8,
["obj"]=5,
["icon"]="47"
},
[3300105]={
@ -2011,7 +1998,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=8,
["obj"]=5,
["icon"]="47"
},
[3300107]={
@ -2031,7 +2018,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=8,
["obj"]=5,
["icon"]="48"
},
[3300200]={
@ -2056,7 +2043,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=1,
["obj"]=5,
["icon"]="38"
},
[3300202]={
@ -3197,6 +3184,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=7,
["icon"]="44"
},
[5400103]={
@ -3213,6 +3201,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=7,
["icon"]="42"
},
[5400104]={
@ -3257,6 +3246,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=7,
["icon"]="58"
},
[5400107]={
@ -3273,6 +3263,7 @@ local skill_rogue = {
["round"]=1
}
},
["obj"]=7,
["icon"]="66"
}
}

View File

@ -76,7 +76,7 @@ local buff = {
},
[52]={
["_id"]=52,
["desc"]="禁锢:本回合只可使用普攻",
["desc"]="禁锢:本回合只可使用普攻,且技能进度不会增长",
["name"]="imprison"
},
[53]={

View File

@ -302,11 +302,29 @@ local monster_base = {
[30011]={
["name"]="亚历山大"
},
[30012]={
["name"]="二丫"
},
[30014]={
["name"]="克劳德"
},
[30015]={
["name"]="魔女琪琪"
},
[30016]={
["name"]="木兰"
},
[30017]={
["name"]="雷神"
},
[30020]={
["name"]="森林狼"
},
[30022]={
["name"]="冰女"
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -33,13 +33,13 @@ local skill = {
["desc"]="森林狼:使用后本次伤害提升,并造成多次技能伤害。"
},
[3400120]={
["desc"]="流星追月:使用后本次伤害提升,并一次巨量技能伤害。"
["desc"]="流星追月:使用后本次伤害提升,并造成一次巨量技能伤害。"
},
[4200120]={
["desc"]="元素链接随机消除3个元素并造成一次技能伤害。"
},
[4300120]={
["desc"]="冰女额外造成一次技能伤害附加冰霜效果1回合。"
["desc"]="霜冻冰晶额外造成一次技能伤害附加冰霜效果1回合。"
},
[4300220]={
["desc"]="鸦姐额外造成一次技能伤害附加腐败效果1回合。"

View File

@ -372,31 +372,31 @@ local skill_rogue = {
["desc"]="急速治疗链接超过5个元素回血效果提升。"
},
[3300200]={
["desc"]="解锁森林狼技能:使用后本次伤害提升,并造成多次技能伤害。"
["desc"]="解锁狼袭瞬杀:使用后本次伤害提升,并造成多次技能伤害。"
},
[3300201]={
["desc"]="森林狼技能有50%概率附加易伤效果2回合。"
["desc"]="狼袭瞬杀有50%概率附加易伤效果2回合。"
},
[3300202]={
["desc"]="森林狼技能使用时本次普攻伤害提升15%。"
["desc"]="狼袭瞬杀使用时本次普攻伤害提升15%。"
},
[3300203]={
["desc"]="森林狼技能伤害提升。"
["desc"]="狼袭瞬杀伤害提升。"
},
[3300204]={
["desc"]="森林狼技能对中毒敌人有50%概率附加中毒效果2回合。"
["desc"]="狼袭瞬杀对中毒敌人有50%概率附加中毒效果2回合。"
},
[3300205]={
["desc"]="森林狼技能附加的中毒效果,伤害提升。"
["desc"]="狼袭瞬杀附加的中毒效果,伤害提升。"
},
[3300206]={
["desc"]="森林狼技能攻击提升15%。"
["desc"]="森林狼攻击提升15%。"
},
[3300207]={
["desc"]="森林狼技能对中毒敌人有100%概率附加中毒效果2回合。"
["desc"]="狼袭瞬杀对中毒敌人有100%概率附加中毒效果2回合。"
},
[3400100]={
["desc"]="解锁流星追月:使用后本次伤害提升,并一次巨量技能伤害。"
["desc"]="解锁流星追月:使用后本次伤害提升,并造成一次巨量技能伤害。"
},
[3400101]={
["desc"]="流星追月可附加易伤效果2回合。"
@ -444,28 +444,28 @@ local skill_rogue = {
["desc"]="元素链接附加冻结效果概率提升到40%。"
},
[4300100]={
["desc"]="解锁冰女技能额外造成一次技能伤害附加冰霜效果1回合。"
["desc"]="解锁霜冻冰晶额外造成一次技能伤害附加冰霜效果1回合。"
},
[4300101]={
["desc"]="冰女技能沿方向可额外消除4格。"
["desc"]="霜冻冰晶沿方向可额外消除4格。"
},
[4300102]={
["desc"]="冰女技能对灼烧敌人的伤害增加50%。"
["desc"]="霜冻冰晶对灼烧敌人的伤害增加50%。"
},
[4300103]={
["desc"]="冰女技能附加的冰霜效果,回合数+1。"
["desc"]="霜冻冰晶附加的冰霜效果,回合数+1。"
},
[4300104]={
["desc"]="冰女技能伤害提升。"
["desc"]="霜冻冰晶伤害提升。"
},
[4300105]={
["desc"]="冰女技能对冰霜敌人有50%概率附加冻结效果1回合。"
["desc"]="霜冻冰晶对冰霜敌人有50%概率附加冻结效果1回合。"
},
[4300106]={
["desc"]="冰女技能后为团队附加冰盾效果2回合。"
["desc"]="霜冻冰晶后为团队附加冰盾效果2回合。"
},
[4300107]={
["desc"]="冰女技能附加的冰盾可反伤400%。"
["desc"]="霜冻冰晶附加的冰盾可反伤400%。"
},
[4300300]={
["desc"]="解锁鸦姐技能额外造成一次技能伤害附加腐败效果1回合。"
@ -540,28 +540,28 @@ local skill_rogue = {
["desc"]="护盾术附加的护盾,反伤效果翻倍。"
},
[5300100]={
["desc"]="解锁魔女琪琪技能:额外造成一次大量技能伤害。"
["desc"]="解锁魔法扫帚:额外造成一次大量技能伤害。"
},
[5300101]={
["desc"]="女琪琪技能可附加中毒效果2回合。"
["desc"]="法扫帚可附加中毒效果2回合。"
},
[5300102]={
["desc"]="女琪琪技能使用时本次普攻伤害提升15%。"
["desc"]="法扫帚使用时本次普攻伤害提升15%。"
},
[5300103]={
["desc"]="女琪琪技能可附加昏睡效果2回合。"
["desc"]="法扫帚可附加昏睡效果2回合。"
},
[5300104]={
["desc"]="女琪琪技能附加的中毒效果,伤害提升。"
["desc"]="法扫帚附加的中毒效果,伤害提升。"
},
[5300105]={
["desc"]="女琪琪技能使用后随机增加一种技能的能量2点。"
["desc"]="法扫帚使用后随机增加一种技能的能量2点。"
},
[5300106]={
["desc"]="女琪琪技能使用后随机增加一种技能的能量2点。"
["desc"]="法扫帚使用后随机增加一种技能的能量2点。"
},
[5300107]={
["desc"]="女琪琪技能有15%概率为团队附加不死效果1回合。"
["desc"]="法扫帚有15%概率为团队附加不死效果1回合。"
},
[5300200]={
["desc"]="解锁灵魂猎手技能:额外造成一次大量技能伤害。"

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -301,12 +301,30 @@ local monster_base = {
},
[30011]={
},
[30012]={
},
[30014]={
},
[30015]={
},
[30016]={
},
[30017]={
},
[30020]={
},
[30022]={
}
}
local config = {
data=monster_base,count=102
data=monster_base,count=108
}
return config

View File

@ -71,19 +71,20 @@ function DailyChallengeComp:refreshBuff()
end
function DailyChallengeComp:refreshBoss()
local curBossId = DataManager.DailyChallengeData:getFinalBossModelId()
if self.bossId == curBossId then
local curBossInfo = DataManager.DailyChallengeData:getFinalBossInfo()
if self.curModelId == curBossInfo.model_id then
return
end
if self.spineBoss then
self.spineBoss:onDestroy()
self.spineBoss = nil
self.bossId = nil
self.curModelId = nil
end
self.bossId = curBossId
SpineManager:loadHeroAsync(self.bossId, self.uiMap["daily_challenge_comp.boss.spine_node"], function(spineObject)
self.curModelId = curBossInfo.model_id
SpineManager:loadHeroAsync(self.curModelId, self.uiMap["daily_challenge_comp.boss.spine_node"], function(spineObject)
self.spineBoss = spineObject
self.spineBoss:setDefaultMix(0)
self.spineBoss:setLocalScale(curBossInfo.model_ui, curBossInfo.model_ui, curBossInfo.model_ui)
self.spineBoss:playAnimation(GConst.BattleConst.SPINE_ANIMATION_NAME.IDLE, true, false)
end)
end

View File

@ -149,10 +149,10 @@ function DailyChallengeData:getTodaySurplusTime()
return result
end
-- 获取最终boss 模型 id
function DailyChallengeData:getFinalBossModelId()
-- 获取最终boss配置信息
function DailyChallengeData:getFinalBossInfo()
local mapCfg = self:getMapConfig()
return ConfigManager:getConfig("monster")[mapCfg.monster[#mapCfg.monster]].model_id
return ConfigManager:getConfig("monster")[mapCfg.monster[#mapCfg.monster]]
end
-- 任务是否完成