puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

属性

Browse Source
This commit is contained in:
puxuan 2025-09-18 17:51:59 +08:00
parent a9998c9169
commit 526b1690c5
17 changed files with 723 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/common/data_manager.lua
View File

@ -161,7 +161,8 @@ function DataManager:initWithServerData(data)
self.FormationData:init(data.fight_info) self.FormationData:init(data.fight_info)
self.EquipData:init(data.heroes_equips) self.EquipData:init(data.heroes_equips)
self.SkinData:init(data.bag.skins) self.SkinData:init(data.bag.skins)
-- HeroData要在EquipData、SkinData之后初始化，依赖它们的属性数据 self.TalentData:init(data.talent)
-- HeroData要在EquipData、SkinData、TalentData之后初始化，依赖它们的属性数据
self.HeroData:init(data.bag.heroes) self.HeroData:init(data.bag.heroes)
self.BagData:init(data.bag) self.BagData:init(data.bag)
-- self.DungeonData:initDungeonWeapon(data.chapter_weapon_challenge) -- self.DungeonData:initDungeonWeapon(data.chapter_weapon_challenge)
@ -197,7 +198,6 @@ function DataManager:initWithServerData(data)
end end
self.HeroFundData:init(data.hero_fund) self.HeroFundData:init(data.hero_fund)
self.FourteenDayData:init(data.fourteen_bounty) self.FourteenDayData:init(data.fourteen_bounty)
self.TalentData:init(data.talent)
-- 任务数据最后初始化,依赖其他模块的数据 -- 任务数据最后初始化,依赖其他模块的数据
self.TaskData:init() self.TaskData:init()

10
lua/app/config/attr.lua
View File

@ -438,6 +438,11 @@ local attr = {
["id"]=78, ["id"]=78,
["name"]="attr_skill_hurt", ["name"]="attr_skill_hurt",
["power"]=50 ["power"]=50
},
[79]={
["id"]=79,
["name"]="dmgdec",
["power"]=50
} }
} }
local keys = { local keys = {
@ -519,12 +524,13 @@ local keys = {
["attr_atk"]=attr[75], ["attr_atk"]=attr[75],
["attr_hp"]=attr[76], ["attr_hp"]=attr[76],
["attr_normal_hurt"]=attr[77], ["attr_normal_hurt"]=attr[77],
["attr_skill_hurt"]=attr[78] ["attr_skill_hurt"]=attr[78],
["dmgdec"]=attr[79]
} }
} }
local config = { local config = {
data=attr, data=attr,
keys=keys, keys=keys,
count=78 count=79
} }
return config return config

644
lua/app/config/daily_challenge_level.lua
View File

@ -5,8 +5,8 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=4,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="Ug==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -24,47 +24,55 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=21,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="VAk=",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=500,
["num_for_nothing"]="Uwhc"
} }
}, },
{ {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=21,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VAk=",
["num"]=30, ["num"]=1,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Vw=="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -76,10 +84,18 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=20,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="VAg=",
["num"]=15, ["num"]=100,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=21,
["id_for_nothing"]="VAk=",
["num"]=2,
["num_for_nothing"]="VA=="
} }
} }
}, },
@ -94,8 +110,8 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=4,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="Ug==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -104,8 +120,8 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=19, ["id"]=19,
["id_for_nothing"]="VwE=", ["id_for_nothing"]="VwE=",
["num"]=11, ["num"]=10,
["num_for_nothing"]="Vwk=" ["num_for_nothing"]="Vwg="
} }
}, },
["task_daily_challenge"]={ ["task_daily_challenge"]={
@ -113,47 +129,55 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=21,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="VAk=",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=500,
["num_for_nothing"]="Uwhc"
} }
}, },
{ {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=22,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VAo=",
["num"]=30, ["num"]=2,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VA=="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -165,10 +189,18 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=20,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="VAg=",
["num"]=16, ["num"]=100,
["num_for_nothing"]="Vw4=" ["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=22,
["id_for_nothing"]="VAo=",
["num"]=2,
["num_for_nothing"]="VA=="
} }
} }
}, },
@ -183,8 +215,8 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=4,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="Ug==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -193,56 +225,64 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=19, ["id"]=19,
["id_for_nothing"]="VwE=", ["id_for_nothing"]="VwE=",
["num"]=12, ["num"]=10,
["num_for_nothing"]="Vwo=" ["num_for_nothing"]="Vwg="
} }
}, },
["task_daily_challenge"]={ ["task_daily_challenge"]={
{ {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=22,
["id_for_nothing"]="VAo=",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=500,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
{ {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=23,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VAs=",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
}
}, },
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=20,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VAg=",
["num"]=30, ["num"]=50,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Uwg="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -254,10 +294,18 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=20,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="VAg=",
["num"]=17, ["num"]=100,
["num_for_nothing"]="Vw8=" ["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=23,
["id_for_nothing"]="VAs=",
["num"]=1,
["num_for_nothing"]="Vw=="
} }
} }
}, },
@ -272,8 +320,8 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=4,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="Ug==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -282,8 +330,8 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=19, ["id"]=19,
["id_for_nothing"]="VwE=", ["id_for_nothing"]="VwE=",
["num"]=13, ["num"]=10,
["num_for_nothing"]="Vws=" ["num_for_nothing"]="Vwg="
} }
}, },
["task_daily_challenge"]={ ["task_daily_challenge"]={
@ -291,47 +339,55 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=23,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="VAs=",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=500,
["num_for_nothing"]="Uwhc"
} }
}, },
{ {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=23,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VAs=",
["num"]=30, ["num"]=1,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Vw=="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -343,10 +399,18 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=20,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="VAg=",
["num"]=18, ["num"]=100,
["num_for_nothing"]="VwA=" ["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=23,
["id_for_nothing"]="VAs=",
["num"]=2,
["num_for_nothing"]="VA=="
} }
} }
}, },
@ -361,8 +425,8 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=4,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="Ug==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -371,56 +435,64 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=19, ["id"]=19,
["id_for_nothing"]="VwE=", ["id_for_nothing"]="VwE=",
["num"]=14, ["num"]=10,
["num_for_nothing"]="Vww=" ["num_for_nothing"]="Vwg="
} }
}, },
["task_daily_challenge"]={ ["task_daily_challenge"]={
{ {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=23,
["id_for_nothing"]="VAs=",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=500,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
{ {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=24,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VAw=",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
}
}, },
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=20,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VAg=",
["num"]=30, ["num"]=50,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Uwg="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -432,10 +504,18 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=20,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="VAg=",
["num"]=19, ["num"]=100,
["num_for_nothing"]="VwE=" ["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=24,
["id_for_nothing"]="VAw=",
["num"]=1,
["num_for_nothing"]="Vw=="
} }
} }
}, },
@ -450,8 +530,8 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=4,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="Ug==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -460,8 +540,8 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=19, ["id"]=19,
["id_for_nothing"]="VwE=", ["id_for_nothing"]="VwE=",
["num"]=15, ["num"]=10,
["num_for_nothing"]="Vw0=" ["num_for_nothing"]="Vwg="
} }
}, },
["task_daily_challenge"]={ ["task_daily_challenge"]={
@ -469,47 +549,55 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=24,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="VAw=",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=500,
["num_for_nothing"]="Uwhc"
} }
}, },
{ {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=25,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VA0=",
["num"]=30, ["num"]=1,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Vw=="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -521,10 +609,18 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=20,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="VAg=",
["num"]=20, ["num"]=100,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=25,
["id_for_nothing"]="VA0=",
["num"]=1,
["num_for_nothing"]="Vw=="
} }
} }
}, },
@ -539,8 +635,8 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=3, ["id"]=4,
["id_for_nothing"]="VQ==", ["id_for_nothing"]="Ug==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -549,8 +645,8 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=19, ["id"]=19,
["id_for_nothing"]="VwE=", ["id_for_nothing"]="VwE=",
["num"]=16, ["num"]=10,
["num_for_nothing"]="Vw4=" ["num_for_nothing"]="Vwg="
} }
}, },
["task_daily_challenge"]={ ["task_daily_challenge"]={
@ -558,47 +654,55 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=25,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="VA0=",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=20,
["num_for_nothing"]="VAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=500,
["num_for_nothing"]="Uwhc"
} }
}, },
{ {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=26,
["id_for_nothing"]="VA==", ["id_for_nothing"]="VA4=",
["num"]=30, ["num"]=1,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="Vw=="
}, },
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=50,
["num_for_nothing"]="Uwg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
},
{
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -610,10 +714,18 @@ local daily_challenge_level = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=20,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="VAg=",
["num"]=21, ["num"]=100,
["num_for_nothing"]="VAk=" ["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=26,
["id_for_nothing"]="VA4=",
["num"]=1,
["num_for_nothing"]="Vw=="
} }
} }
}, },

228
lua/app/config/equip.lua
View File

@ -1,7 +1,7 @@
local equip = { local equip = {
[111]={ [111]={
["type"]=1, ["type"]=1,
["qlt"]=1, ["qlt"]=2,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -46,7 +46,7 @@ local equip = {
}, },
[112]={ [112]={
["type"]=1, ["type"]=1,
["qlt"]=1, ["qlt"]=2,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -91,7 +91,7 @@ local equip = {
}, },
[121]={ [121]={
["type"]=1, ["type"]=1,
["qlt"]=2, ["qlt"]=3,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -136,7 +136,7 @@ local equip = {
}, },
[122]={ [122]={
["type"]=1, ["type"]=1,
["qlt"]=2, ["qlt"]=3,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -181,7 +181,7 @@ local equip = {
}, },
[123]={ [123]={
["type"]=1, ["type"]=1,
["qlt"]=2, ["qlt"]=3,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -226,7 +226,7 @@ local equip = {
}, },
[131]={ [131]={
["type"]=1, ["type"]=1,
["qlt"]=3, ["qlt"]=4,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -271,7 +271,7 @@ local equip = {
}, },
[132]={ [132]={
["type"]=1, ["type"]=1,
["qlt"]=3, ["qlt"]=4,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -316,7 +316,7 @@ local equip = {
}, },
[133]={ [133]={
["type"]=1, ["type"]=1,
["qlt"]=3, ["qlt"]=4,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -361,7 +361,7 @@ local equip = {
}, },
[134]={ [134]={
["type"]=1, ["type"]=1,
["qlt"]=3, ["qlt"]=4,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -406,7 +406,7 @@ local equip = {
}, },
[141]={ [141]={
["type"]=1, ["type"]=1,
["qlt"]=4, ["qlt"]=5,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -451,7 +451,7 @@ local equip = {
}, },
[142]={ [142]={
["type"]=1, ["type"]=1,
["qlt"]=4, ["qlt"]=5,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -496,7 +496,7 @@ local equip = {
}, },
[143]={ [143]={
["type"]=1, ["type"]=1,
["qlt"]=4, ["qlt"]=5,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -541,7 +541,7 @@ local equip = {
}, },
[144]={ [144]={
["type"]=1, ["type"]=1,
["qlt"]=4, ["qlt"]=5,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -586,7 +586,7 @@ local equip = {
}, },
[145]={ [145]={
["type"]=1, ["type"]=1,
["qlt"]=4, ["qlt"]=5,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -631,7 +631,7 @@ local equip = {
}, },
[151]={ [151]={
["type"]=1, ["type"]=1,
["qlt"]=5, ["qlt"]=6,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -676,7 +676,7 @@ local equip = {
}, },
[152]={ [152]={
["type"]=1, ["type"]=1,
["qlt"]=5, ["qlt"]=6,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -721,7 +721,7 @@ local equip = {
}, },
[153]={ [153]={
["type"]=1, ["type"]=1,
["qlt"]=5, ["qlt"]=6,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -766,7 +766,7 @@ local equip = {
}, },
[154]={ [154]={
["type"]=1, ["type"]=1,
["qlt"]=5, ["qlt"]=6,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -811,7 +811,7 @@ local equip = {
}, },
[155]={ [155]={
["type"]=1, ["type"]=1,
["qlt"]=5, ["qlt"]=6,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -856,7 +856,7 @@ local equip = {
}, },
[211]={ [211]={
["type"]=2, ["type"]=2,
["qlt"]=1, ["qlt"]=2,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -901,7 +901,7 @@ local equip = {
}, },
[212]={ [212]={
["type"]=2, ["type"]=2,
["qlt"]=1, ["qlt"]=2,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -946,7 +946,7 @@ local equip = {
}, },
[221]={ [221]={
["type"]=2, ["type"]=2,
["qlt"]=2, ["qlt"]=3,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -991,7 +991,7 @@ local equip = {
}, },
[222]={ [222]={
["type"]=2, ["type"]=2,
["qlt"]=2, ["qlt"]=3,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1036,7 +1036,7 @@ local equip = {
}, },
[223]={ [223]={
["type"]=2, ["type"]=2,
["qlt"]=2, ["qlt"]=3,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1081,7 +1081,7 @@ local equip = {
}, },
[231]={ [231]={
["type"]=2, ["type"]=2,
["qlt"]=3, ["qlt"]=4,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1126,7 +1126,7 @@ local equip = {
}, },
[232]={ [232]={
["type"]=2, ["type"]=2,
["qlt"]=3, ["qlt"]=4,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1171,7 +1171,7 @@ local equip = {
}, },
[233]={ [233]={
["type"]=2, ["type"]=2,
["qlt"]=3, ["qlt"]=4,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1216,7 +1216,7 @@ local equip = {
}, },
[234]={ [234]={
["type"]=2, ["type"]=2,
["qlt"]=3, ["qlt"]=4,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1261,7 +1261,7 @@ local equip = {
}, },
[241]={ [241]={
["type"]=2, ["type"]=2,
["qlt"]=4, ["qlt"]=5,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1306,7 +1306,7 @@ local equip = {
}, },
[242]={ [242]={
["type"]=2, ["type"]=2,
["qlt"]=4, ["qlt"]=5,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1351,7 +1351,7 @@ local equip = {
}, },
[243]={ [243]={
["type"]=2, ["type"]=2,
["qlt"]=4, ["qlt"]=5,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1396,7 +1396,7 @@ local equip = {
}, },
[244]={ [244]={
["type"]=2, ["type"]=2,
["qlt"]=4, ["qlt"]=5,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1441,7 +1441,7 @@ local equip = {
}, },
[245]={ [245]={
["type"]=2, ["type"]=2,
["qlt"]=4, ["qlt"]=5,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1486,7 +1486,7 @@ local equip = {
}, },
[251]={ [251]={
["type"]=2, ["type"]=2,
["qlt"]=5, ["qlt"]=6,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1531,7 +1531,7 @@ local equip = {
}, },
[252]={ [252]={
["type"]=2, ["type"]=2,
["qlt"]=5, ["qlt"]=6,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1576,7 +1576,7 @@ local equip = {
}, },
[253]={ [253]={
["type"]=2, ["type"]=2,
["qlt"]=5, ["qlt"]=6,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1621,7 +1621,7 @@ local equip = {
}, },
[254]={ [254]={
["type"]=2, ["type"]=2,
["qlt"]=5, ["qlt"]=6,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1666,7 +1666,7 @@ local equip = {
}, },
[255]={ [255]={
["type"]=2, ["type"]=2,
["qlt"]=5, ["qlt"]=6,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -1711,7 +1711,7 @@ local equip = {
}, },
[311]={ [311]={
["type"]=3, ["type"]=3,
["qlt"]=1, ["qlt"]=2,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -1756,7 +1756,7 @@ local equip = {
}, },
[312]={ [312]={
["type"]=3, ["type"]=3,
["qlt"]=1, ["qlt"]=2,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -1801,7 +1801,7 @@ local equip = {
}, },
[321]={ [321]={
["type"]=3, ["type"]=3,
["qlt"]=2, ["qlt"]=3,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -1846,7 +1846,7 @@ local equip = {
}, },
[322]={ [322]={
["type"]=3, ["type"]=3,
["qlt"]=2, ["qlt"]=3,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -1891,7 +1891,7 @@ local equip = {
}, },
[323]={ [323]={
["type"]=3, ["type"]=3,
["qlt"]=2, ["qlt"]=3,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -1936,7 +1936,7 @@ local equip = {
}, },
[331]={ [331]={
["type"]=3, ["type"]=3,
["qlt"]=3, ["qlt"]=4,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -1981,7 +1981,7 @@ local equip = {
}, },
[332]={ [332]={
["type"]=3, ["type"]=3,
["qlt"]=3, ["qlt"]=4,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2026,7 +2026,7 @@ local equip = {
}, },
[333]={ [333]={
["type"]=3, ["type"]=3,
["qlt"]=3, ["qlt"]=4,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2071,7 +2071,7 @@ local equip = {
}, },
[334]={ [334]={
["type"]=3, ["type"]=3,
["qlt"]=3, ["qlt"]=4,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2116,7 +2116,7 @@ local equip = {
}, },
[341]={ [341]={
["type"]=3, ["type"]=3,
["qlt"]=4, ["qlt"]=5,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2161,7 +2161,7 @@ local equip = {
}, },
[342]={ [342]={
["type"]=3, ["type"]=3,
["qlt"]=4, ["qlt"]=5,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2206,7 +2206,7 @@ local equip = {
}, },
[343]={ [343]={
["type"]=3, ["type"]=3,
["qlt"]=4, ["qlt"]=5,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2251,7 +2251,7 @@ local equip = {
}, },
[344]={ [344]={
["type"]=3, ["type"]=3,
["qlt"]=4, ["qlt"]=5,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2296,7 +2296,7 @@ local equip = {
}, },
[345]={ [345]={
["type"]=3, ["type"]=3,
["qlt"]=4, ["qlt"]=5,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2341,7 +2341,7 @@ local equip = {
}, },
[351]={ [351]={
["type"]=3, ["type"]=3,
["qlt"]=5, ["qlt"]=6,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2386,7 +2386,7 @@ local equip = {
}, },
[352]={ [352]={
["type"]=3, ["type"]=3,
["qlt"]=5, ["qlt"]=6,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2431,7 +2431,7 @@ local equip = {
}, },
[353]={ [353]={
["type"]=3, ["type"]=3,
["qlt"]=5, ["qlt"]=6,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2476,7 +2476,7 @@ local equip = {
}, },
[354]={ [354]={
["type"]=3, ["type"]=3,
["qlt"]=5, ["qlt"]=6,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2521,7 +2521,7 @@ local equip = {
}, },
[355]={ [355]={
["type"]=3, ["type"]=3,
["qlt"]=5, ["qlt"]=6,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2566,7 +2566,7 @@ local equip = {
}, },
[411]={ [411]={
["type"]=4, ["type"]=4,
["qlt"]=1, ["qlt"]=2,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2611,7 +2611,7 @@ local equip = {
}, },
[412]={ [412]={
["type"]=4, ["type"]=4,
["qlt"]=1, ["qlt"]=2,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2656,7 +2656,7 @@ local equip = {
}, },
[421]={ [421]={
["type"]=4, ["type"]=4,
["qlt"]=2, ["qlt"]=3,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2701,7 +2701,7 @@ local equip = {
}, },
[422]={ [422]={
["type"]=4, ["type"]=4,
["qlt"]=2, ["qlt"]=3,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2746,7 +2746,7 @@ local equip = {
}, },
[423]={ [423]={
["type"]=4, ["type"]=4,
["qlt"]=2, ["qlt"]=3,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2791,7 +2791,7 @@ local equip = {
}, },
[431]={ [431]={
["type"]=4, ["type"]=4,
["qlt"]=3, ["qlt"]=4,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2836,7 +2836,7 @@ local equip = {
}, },
[432]={ [432]={
["type"]=4, ["type"]=4,
["qlt"]=3, ["qlt"]=4,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2881,7 +2881,7 @@ local equip = {
}, },
[433]={ [433]={
["type"]=4, ["type"]=4,
["qlt"]=3, ["qlt"]=4,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2926,7 +2926,7 @@ local equip = {
}, },
[434]={ [434]={
["type"]=4, ["type"]=4,
["qlt"]=3, ["qlt"]=4,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -2971,7 +2971,7 @@ local equip = {
}, },
[441]={ [441]={
["type"]=4, ["type"]=4,
["qlt"]=4, ["qlt"]=5,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3016,7 +3016,7 @@ local equip = {
}, },
[442]={ [442]={
["type"]=4, ["type"]=4,
["qlt"]=4, ["qlt"]=5,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3061,7 +3061,7 @@ local equip = {
}, },
[443]={ [443]={
["type"]=4, ["type"]=4,
["qlt"]=4, ["qlt"]=5,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3106,7 +3106,7 @@ local equip = {
}, },
[444]={ [444]={
["type"]=4, ["type"]=4,
["qlt"]=4, ["qlt"]=5,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3151,7 +3151,7 @@ local equip = {
}, },
[445]={ [445]={
["type"]=4, ["type"]=4,
["qlt"]=4, ["qlt"]=5,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3196,7 +3196,7 @@ local equip = {
}, },
[451]={ [451]={
["type"]=4, ["type"]=4,
["qlt"]=5, ["qlt"]=6,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3241,7 +3241,7 @@ local equip = {
}, },
[452]={ [452]={
["type"]=4, ["type"]=4,
["qlt"]=5, ["qlt"]=6,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3286,7 +3286,7 @@ local equip = {
}, },
[453]={ [453]={
["type"]=4, ["type"]=4,
["qlt"]=5, ["qlt"]=6,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3331,7 +3331,7 @@ local equip = {
}, },
[454]={ [454]={
["type"]=4, ["type"]=4,
["qlt"]=5, ["qlt"]=6,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3376,7 +3376,7 @@ local equip = {
}, },
[455]={ [455]={
["type"]=4, ["type"]=4,
["qlt"]=5, ["qlt"]=6,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_hp", ["type"]="attr_hp",
@ -3421,7 +3421,7 @@ local equip = {
}, },
[511]={ [511]={
["type"]=5, ["type"]=5,
["qlt"]=1, ["qlt"]=2,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3466,7 +3466,7 @@ local equip = {
}, },
[512]={ [512]={
["type"]=5, ["type"]=5,
["qlt"]=1, ["qlt"]=2,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3511,7 +3511,7 @@ local equip = {
}, },
[521]={ [521]={
["type"]=5, ["type"]=5,
["qlt"]=2, ["qlt"]=3,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3556,7 +3556,7 @@ local equip = {
}, },
[522]={ [522]={
["type"]=5, ["type"]=5,
["qlt"]=2, ["qlt"]=3,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3601,7 +3601,7 @@ local equip = {
}, },
[523]={ [523]={
["type"]=5, ["type"]=5,
["qlt"]=2, ["qlt"]=3,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3646,7 +3646,7 @@ local equip = {
}, },
[531]={ [531]={
["type"]=5, ["type"]=5,
["qlt"]=3, ["qlt"]=4,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3691,7 +3691,7 @@ local equip = {
}, },
[532]={ [532]={
["type"]=5, ["type"]=5,
["qlt"]=3, ["qlt"]=4,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3736,7 +3736,7 @@ local equip = {
}, },
[533]={ [533]={
["type"]=5, ["type"]=5,
["qlt"]=3, ["qlt"]=4,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3781,7 +3781,7 @@ local equip = {
}, },
[534]={ [534]={
["type"]=5, ["type"]=5,
["qlt"]=3, ["qlt"]=4,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3826,7 +3826,7 @@ local equip = {
}, },
[541]={ [541]={
["type"]=5, ["type"]=5,
["qlt"]=4, ["qlt"]=5,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3871,7 +3871,7 @@ local equip = {
}, },
[542]={ [542]={
["type"]=5, ["type"]=5,
["qlt"]=4, ["qlt"]=5,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3916,7 +3916,7 @@ local equip = {
}, },
[543]={ [543]={
["type"]=5, ["type"]=5,
["qlt"]=4, ["qlt"]=5,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -3961,7 +3961,7 @@ local equip = {
}, },
[544]={ [544]={
["type"]=5, ["type"]=5,
["qlt"]=4, ["qlt"]=5,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4006,7 +4006,7 @@ local equip = {
}, },
[545]={ [545]={
["type"]=5, ["type"]=5,
["qlt"]=4, ["qlt"]=5,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4051,7 +4051,7 @@ local equip = {
}, },
[551]={ [551]={
["type"]=5, ["type"]=5,
["qlt"]=5, ["qlt"]=6,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4096,7 +4096,7 @@ local equip = {
}, },
[552]={ [552]={
["type"]=5, ["type"]=5,
["qlt"]=5, ["qlt"]=6,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4141,7 +4141,7 @@ local equip = {
}, },
[553]={ [553]={
["type"]=5, ["type"]=5,
["qlt"]=5, ["qlt"]=6,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4186,7 +4186,7 @@ local equip = {
}, },
[554]={ [554]={
["type"]=5, ["type"]=5,
["qlt"]=5, ["qlt"]=6,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4231,7 +4231,7 @@ local equip = {
}, },
[555]={ [555]={
["type"]=5, ["type"]=5,
["qlt"]=5, ["qlt"]=6,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4276,7 +4276,7 @@ local equip = {
}, },
[611]={ [611]={
["type"]=6, ["type"]=6,
["qlt"]=1, ["qlt"]=2,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4321,7 +4321,7 @@ local equip = {
}, },
[612]={ [612]={
["type"]=6, ["type"]=6,
["qlt"]=1, ["qlt"]=2,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4366,7 +4366,7 @@ local equip = {
}, },
[621]={ [621]={
["type"]=6, ["type"]=6,
["qlt"]=2, ["qlt"]=3,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4411,7 +4411,7 @@ local equip = {
}, },
[622]={ [622]={
["type"]=6, ["type"]=6,
["qlt"]=2, ["qlt"]=3,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4456,7 +4456,7 @@ local equip = {
}, },
[623]={ [623]={
["type"]=6, ["type"]=6,
["qlt"]=2, ["qlt"]=3,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4501,7 +4501,7 @@ local equip = {
}, },
[631]={ [631]={
["type"]=6, ["type"]=6,
["qlt"]=3, ["qlt"]=4,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4546,7 +4546,7 @@ local equip = {
}, },
[632]={ [632]={
["type"]=6, ["type"]=6,
["qlt"]=3, ["qlt"]=4,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4591,7 +4591,7 @@ local equip = {
}, },
[633]={ [633]={
["type"]=6, ["type"]=6,
["qlt"]=3, ["qlt"]=4,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4636,7 +4636,7 @@ local equip = {
}, },
[634]={ [634]={
["type"]=6, ["type"]=6,
["qlt"]=3, ["qlt"]=4,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4681,7 +4681,7 @@ local equip = {
}, },
[641]={ [641]={
["type"]=6, ["type"]=6,
["qlt"]=4, ["qlt"]=5,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4726,7 +4726,7 @@ local equip = {
}, },
[642]={ [642]={
["type"]=6, ["type"]=6,
["qlt"]=4, ["qlt"]=5,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4771,7 +4771,7 @@ local equip = {
}, },
[643]={ [643]={
["type"]=6, ["type"]=6,
["qlt"]=4, ["qlt"]=5,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4816,7 +4816,7 @@ local equip = {
}, },
[644]={ [644]={
["type"]=6, ["type"]=6,
["qlt"]=4, ["qlt"]=5,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4861,7 +4861,7 @@ local equip = {
}, },
[645]={ [645]={
["type"]=6, ["type"]=6,
["qlt"]=4, ["qlt"]=5,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4906,7 +4906,7 @@ local equip = {
}, },
[651]={ [651]={
["type"]=6, ["type"]=6,
["qlt"]=5, ["qlt"]=6,
["star"]=1, ["star"]=1,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4951,7 +4951,7 @@ local equip = {
}, },
[652]={ [652]={
["type"]=6, ["type"]=6,
["qlt"]=5, ["qlt"]=6,
["star"]=2, ["star"]=2,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -4996,7 +4996,7 @@ local equip = {
}, },
[653]={ [653]={
["type"]=6, ["type"]=6,
["qlt"]=5, ["qlt"]=6,
["star"]=3, ["star"]=3,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -5041,7 +5041,7 @@ local equip = {
}, },
[654]={ [654]={
["type"]=6, ["type"]=6,
["qlt"]=5, ["qlt"]=6,
["star"]=4, ["star"]=4,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",
@ -5086,7 +5086,7 @@ local equip = {
}, },
[655]={ [655]={
["type"]=6, ["type"]=6,
["qlt"]=5, ["qlt"]=6,
["star"]=5, ["star"]=5,
["base_attr"]={ ["base_attr"]={
["type"]="attr_atk", ["type"]="attr_atk",

12
lua/app/config/func_open.lua
View File

@ -12,7 +12,7 @@ local func_open = {
["icon"]="module_unlock_task" ["icon"]="module_unlock_task"
}, },
["act_level_gift"]={ ["act_level_gift"]={
["level"]=5, ["level"]=999,
["icon"]="module_unlock_fund" ["icon"]="module_unlock_fund"
}, },
["idle_drop"]={ ["idle_drop"]={
@ -20,7 +20,7 @@ local func_open = {
["icon"]="module_unlock_idle" ["icon"]="module_unlock_idle"
}, },
["act_sevenday"]={ ["act_sevenday"]={
["stage"]=2, ["stage"]=999,
["icon"]="module_unlock_sevenday" ["icon"]="module_unlock_sevenday"
}, },
["mall"]={ ["mall"]={
@ -28,7 +28,7 @@ local func_open = {
["pop_ups"]=1 ["pop_ups"]=1
}, },
["mall_daily"]={ ["mall_daily"]={
["stage"]=4, ["stage"]=999,
["icon"]="module_unlock_dailyshop" ["icon"]="module_unlock_dailyshop"
}, },
["store_box_open"]={ ["store_box_open"]={
@ -76,11 +76,11 @@ local func_open = {
["pop_ups"]=1 ["pop_ups"]=1
}, },
["equip_weapon_open"]={ ["equip_weapon_open"]={
["stage"]=8, ["stage"]=999,
["icon"]="module_unlock_weapon" ["icon"]="module_unlock_weapon"
}, },
["equip_armor_open"]={ ["equip_armor_open"]={
["stage"]=10, ["stage"]=999,
["icon"]="module_unlock_equip" ["icon"]="module_unlock_equip"
}, },
["collection_open"]={ ["collection_open"]={
@ -125,7 +125,7 @@ local func_open = {
}, },
["summon_open"]={ ["summon_open"]={
["stage"]=1, ["stage"]=1,
["icon"]="module_unlock_arena" ["pop_ups"]=1
} }
} }
local config = { local config = {

18
lua/app/config/localization/localization_global_const.lua
View File

@ -734,6 +734,24 @@ local LocalizationGlobalConst =
EQUIP_HERO_DESC_34 = "EQUIP_HERO_DESC_34", EQUIP_HERO_DESC_34 = "EQUIP_HERO_DESC_34",
EQUIP_HERO_ACTIVATION_1 = "EQUIP_HERO_ACTIVATION_1", EQUIP_HERO_ACTIVATION_1 = "EQUIP_HERO_ACTIVATION_1",
EQUIP_HERO_ACTIVATION_2 = "EQUIP_HERO_ACTIVATION_2", EQUIP_HERO_ACTIVATION_2 = "EQUIP_HERO_ACTIVATION_2",
EQUIP_HERO_M_1 = "EQUIP_HERO_M_1",
EQUIP_HERO_M_2 = "EQUIP_HERO_M_2",
EQUIP_HERO_M_3 = "EQUIP_HERO_M_3",
EQUIP_QLT_DESC_1 = "EQUIP_QLT_DESC_1",
EQUIP_QLT_DESC_2 = "EQUIP_QLT_DESC_2",
EQUIP_QLT_DESC_3 = "EQUIP_QLT_DESC_3",
EQUIP_QLT_DESC_4 = "EQUIP_QLT_DESC_4",
EQUIP_QLT_DESC_5 = "EQUIP_QLT_DESC_5",
LV_POINT = "LV_POINT",
EQUIP_HERO_1 = "EQUIP_HERO_1",
EQUIP_HERO_2 = "EQUIP_HERO_2",
EQUIP_HERO_3 = "EQUIP_HERO_3",
EQUIP_DESC_40 = "EQUIP_DESC_40",
EQUIP_DESC_48 = "EQUIP_DESC_48",
EQUIP_QLT_SELECT = "EQUIP_QLT_SELECT",
EQUIP_QLT_SELECT_ALL_1 = "EQUIP_QLT_SELECT_ALL_1",
EQUIP_QLT_SELECT_ALL_2 = "EQUIP_QLT_SELECT_ALL_2",
REBACK_MATERIAL_DESC = "REBACK_MATERIAL_DESC",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

40
lua/app/config/skill.lua
View File

@ -6121,7 +6121,7 @@ local skill = {
[5400121]={ [5400121]={
["position"]=5, ["position"]=5,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=7, ["trigger"]=6,
["effect"]={ ["effect"]={
{ {
["type"]="poison", ["type"]="poison",
@ -6130,7 +6130,7 @@ local skill = {
["round"]=2 ["round"]=2
} }
}, },
["obj"]=1, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
2, 2,
0 0
@ -6139,7 +6139,7 @@ local skill = {
[5400122]={ [5400122]={
["position"]=5, ["position"]=5,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=7, ["trigger"]=6,
["effect"]={ ["effect"]={
{ {
["type"]="poison", ["type"]="poison",
@ -6148,7 +6148,7 @@ local skill = {
["round"]=2 ["round"]=2
} }
}, },
["obj"]=1 ["obj"]=2
}, },
[5400123]={ [5400123]={
["position"]=5, ["position"]=5,
@ -8913,8 +8913,8 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
@ -8937,8 +8937,8 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
@ -8961,8 +8961,8 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
@ -8998,8 +8998,8 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["cd"]=2, ["cd"]=2,
["cd_start"]=0, ["cd_start"]=0,
@ -9029,8 +9029,8 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
@ -9053,8 +9053,8 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
@ -9077,8 +9077,8 @@ local skill = {
}, },
["obj"]=2, ["obj"]=2,
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["shake_time"]=100, ["shake_time"]=100,
["shake_type"]=1, ["shake_type"]=1,
@ -9124,8 +9124,8 @@ local skill = {
3 3
}, },
["skill_position"]={ ["skill_position"]={
1, 2,
140 0
}, },
["cd"]=2, ["cd"]=2,
["cd_start"]=0, ["cd_start"]=0,

6
lua/app/config/skill_rogue.lua
View File

@ -349,7 +349,7 @@ local skill_rogue = {
[24]={ [24]={
["universal"]=1, ["universal"]=1,
["limit_times"]=2, ["limit_times"]=2,
["weight"]=2000, ["weight"]=0,
["qlt"]=3, ["qlt"]=3,
["type"]=9, ["type"]=9,
["effect"]={ ["effect"]={
@ -382,7 +382,7 @@ local skill_rogue = {
["universal"]=1, ["universal"]=1,
["toast_mark"]=11, ["toast_mark"]=11,
["limit_times"]=3, ["limit_times"]=3,
["weight"]=2000, ["weight"]=0,
["qlt"]=3, ["qlt"]=3,
["type"]=5, ["type"]=5,
["attr"]={ ["attr"]={
@ -425,7 +425,7 @@ local skill_rogue = {
}, },
[29]={ [29]={
["universal"]=1, ["universal"]=1,
["weight"]=3000, ["weight"]=0,
["qlt"]=3, ["qlt"]=3,
["type"]=9, ["type"]=9,
["effect"]={ ["effect"]={

18
lua/app/config/strings/cn/global.lua
View File

@ -734,6 +734,24 @@ local localization_global =
["EQUIP_HERO_DESC_34"] = "强化至<color=#00FF15>{0}</color>级可继续精炼", ["EQUIP_HERO_DESC_34"] = "强化至<color=#00FF15>{0}</color>级可继续精炼",
["EQUIP_HERO_ACTIVATION_1"] = "已激活:强化共鸣Lv{0}", ["EQUIP_HERO_ACTIVATION_1"] = "已激活:强化共鸣Lv{0}",
["EQUIP_HERO_ACTIVATION_2"] = "已激活:精炼共鸣Lv{0}", ["EQUIP_HERO_ACTIVATION_2"] = "已激活:精炼共鸣Lv{0}",
["EQUIP_HERO_M_1"] = "所有装备强化{0}可激活下个等级",
["EQUIP_HERO_M_2"] = "所有装备品质达到{0}可激活下个等级",
["EQUIP_HERO_M_3"] = "所有装备精炼{0}级可激活下个等级",
["EQUIP_QLT_DESC_1"] = "<color=#5bff5f>绿{0}星</color>",
["EQUIP_QLT_DESC_2"] = "<color=#4adbff>蓝{0}星</color>",
["EQUIP_QLT_DESC_3"] = "<color=#df70ff>紫{0}星</color>",
["EQUIP_QLT_DESC_4"] = "<color=#ff9b59>橙{0}星</color>",
["EQUIP_QLT_DESC_5"] = "<color=#ff5d5d>红{0}星</color>",
["LV_POINT"] = "LV.",
["EQUIP_HERO_1"] = "强化共鸣",
["EQUIP_HERO_2"] = "品质共鸣",
["EQUIP_HERO_3"] = "精炼共鸣",
["EQUIP_DESC_40"] = "没有可分解的装备",
["EQUIP_DESC_48"] = "分解后所选装备会消失，确定分解吗？",
["EQUIP_QLT_SELECT"] = "{0}\n及以下",
["EQUIP_QLT_SELECT_ALL_1"] = "所有品质",
["EQUIP_QLT_SELECT_ALL_2"] = "所有部位",
["REBACK_MATERIAL_DESC"] = "分解获得",
} }
return localization_global return localization_global

24
lua/app/config/summon.lua
View File

@ -15,43 +15,43 @@ local summon = {
["summon"]={ ["summon"]={
{ {
["id"]=13001, ["id"]=13001,
["weight"]=11200 ["weight"]=13800
}, },
{ {
["id"]=23001, ["id"]=23001,
["weight"]=11200 ["weight"]=13800
}, },
{ {
["id"]=33001, ["id"]=33001,
["weight"]=11200 ["weight"]=13800
}, },
{ {
["id"]=43001, ["id"]=43001,
["weight"]=11200 ["weight"]=13800
}, },
{ {
["id"]=53001, ["id"]=53001,
["weight"]=11200 ["weight"]=13800
}, },
{ {
["id"]=14001, ["id"]=14001,
["weight"]=8680 ["weight"]=6080
}, },
{ {
["id"]=24001, ["id"]=24001,
["weight"]=8680 ["weight"]=6080
}, },
{ {
["id"]=34001, ["id"]=34001,
["weight"]=8680 ["weight"]=6080
}, },
{ {
["id"]=44001, ["id"]=44001,
["weight"]=8680 ["weight"]=6080
}, },
{ {
["id"]=54001, ["id"]=54001,
["weight"]=8680 ["weight"]=6080
}, },
{ {
["id"]=15001, ["id"]=15001,
@ -111,11 +111,11 @@ local summon = {
["show"]={ ["show"]={
{ {
3, 3,
5600 6900
}, },
{ {
4, 4,
4340 3040
}, },
{ {
5, 5,

11
lua/app/global/global_const.lua
View File

@ -653,6 +653,17 @@ GConst.MATCH_ALL_ATKP_NAME = {
[5] = "attr_atkp_purple_all", [5] = "attr_atkp_purple_all",
} }
GConst.ALL_ATTR = {
ATTR_ATK_ALL = "atk_all", -- 全体英雄攻击（固定值）
ATTR_HP_ALL = "attr_hp_all", -- 全体英雄生命（固定值）
ATTR_DMGDEC_ALL = "attr_dmgdec_all", -- 全体减伤（固定值）
ATTR_CRIT_ALL = "attr_crit_all", -- 全体暴击率
ATTR_CRIT_TIME_ALL = "attr_crit_time_all", -- 全体暴击伤害
ATTR_NORMAL_HURTP_ALL = "attr_normal_hurtp_all",-- 全体普攻增伤（百分比）
ATTR_SKILL_HURTP_ALL = "attr_skill_hurtp_all", -- 全体技能增伤（百分比）
ATTR_ATKP_ALL = "attr_atkp_all", -- 全体攻击（百分比）
}
GConst.GAMEOBJECT_LAYER = { GConst.GAMEOBJECT_LAYER = {
DEFAULT = CS.BF.Utils.NameToLayer("Default"), DEFAULT = CS.BF.Utils.NameToLayer("Default"),
UI = CS.BF.Utils.NameToLayer("UI"), UI = CS.BF.Utils.NameToLayer("UI"),

1
lua/app/module/battle/battle_const.lua
View File

@ -492,6 +492,7 @@ local ATTR_NAME = {
ATTR_ATKP_GREEN_ALL = "attr_atkp_green_all", ATTR_ATKP_GREEN_ALL = "attr_atkp_green_all",
ATTR_ATKP_BLUE_ALL = "attr_atkp_blue_all", ATTR_ATKP_BLUE_ALL = "attr_atkp_blue_all",
ATTR_ATKP_PURPLE_ALL = "attr_atkp_purple_all", ATTR_ATKP_PURPLE_ALL = "attr_atkp_purple_all",
DMGDEC = "dmgdec",
INVINCIBLE_SHIELD = "invincible_shield", INVINCIBLE_SHIELD = "invincible_shield",
REBIRTH = "rebirth", REBIRTH = "rebirth",

6
lua/app/ui/common/message_box.lua
View File

@ -82,7 +82,7 @@ function MessageBox:showMessageBox(params)
prefabObject._closeByAndroidBackspace = true prefabObject._closeByAndroidBackspace = true
end end
uiMap["message_box.title_bg_img.btn.ok_btn"]:setVisible(true) uiMap["message_box.title_bg_img.btn.ok_btn"]:setVisible(true)
uiMap["message_box.title_bg_img.btn.ok_btn"]:setAnchoredPositionX(-124) uiMap["message_box.title_bg_img.btn.ok_btn"]:setAnchoredPositionX(133)
uiMap["message_box.title_bg_img.btn.cancel_btn"]:setVisible(true) uiMap["message_box.title_bg_img.btn.cancel_btn"]:setVisible(true)
uiMap["message_box.title_bg_img.btn.cancel_btn"]:addClickListener(function() uiMap["message_box.title_bg_img.btn.cancel_btn"]:addClickListener(function()
self:closeAndClear(prefabObject, uiMap) self:closeAndClear(prefabObject, uiMap)
@ -104,7 +104,7 @@ function MessageBox:showMessageBox(params)
end) end)
if showToday then -- 今天内不在提示 if showToday then -- 今天内不在提示
uiMap["message_box.title_bg_img.btn"]:setAnchoredPositionY(-136) uiMap["message_box.title_bg_img.btn"]:setAnchoredPositionY(-168)
uiMap["message_box.title_bg_img.today"]:setVisible(true) uiMap["message_box.title_bg_img.today"]:setVisible(true)
uiMap["message_box.title_bg_img.today.check.select"]:setVisible(false) uiMap["message_box.title_bg_img.today.check.select"]:setVisible(false)
@ -120,7 +120,7 @@ function MessageBox:showMessageBox(params)
GFunc.centerImgAndTx(checkUI, textUI, 5) GFunc.centerImgAndTx(checkUI, textUI, 5)
else else
uiMap["message_box.title_bg_img.btn"]:setAnchoredPositionY(-120) uiMap["message_box.title_bg_img.btn"]:setAnchoredPositionY(-168)
uiMap["message_box.title_bg_img.today"]:setVisible(false) uiMap["message_box.title_bg_img.today"]:setVisible(false)
end end
end) end)

8
lua/app/userdata/battle/battle_base_data.lua
View File

@ -805,13 +805,7 @@ function BattleBaseData:initHeroData(formation)
---- 攻击力 ---- 攻击力
for matchType, attrName in pairs(GConst.MATCH_ATTACK_NAME) do for matchType, attrName in pairs(GConst.MATCH_ATTACK_NAME) do
unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName) unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName) // DEFAULT_FACTOR
local atkAddName = GConst.MATCH_ATTACK_ADD_NAME[matchType]
if atkAddName then
unitData.attr[attrName] = unitData.attr[attrName] + heroEntity:getTotalAttrValue(atkAddName)
end
unitData.attr[attrName] = unitData.attr[attrName] // DEFAULT_FACTOR
end end
---- 暴击率 ---- 暴击率

15
lua/app/userdata/hero/hero_data.lua
View File

@ -14,6 +14,7 @@ function HeroData:ctor()
self.allAtkpAttr = {} self.allAtkpAttr = {}
self.allAtkpAttrByHero = {} self.allAtkpAttrByHero = {}
self.allAtkpAttrByTalent = {}
end end
function HeroData:clear() function HeroData:clear()
@ -334,7 +335,14 @@ function HeroData:setHeroAttr(heroId, attr)
self:setAllHeroesDitry() self:setAllHeroesDitry()
end end
function HeroData:setTalentAttr(attr)
self.allAtkpAttrByTalent = attr
self:calcAttr()
self:setAllHeroesDitry()
end
function HeroData:calcAttr() function HeroData:calcAttr()
self.allAtkpAttr = {}
for heroId, attrs in pairs(self.allAtkpAttrByHero) do for heroId, attrs in pairs(self.allAtkpAttrByHero) do
-- self.baseAttrOriginal[ATTR_NAME.ATK_RED] = 0 -- self.baseAttrOriginal[ATTR_NAME.ATK_RED] = 0
local matchType = self.heroes[heroId]:getMatchType() local matchType = self.heroes[heroId]:getMatchType()
@ -343,6 +351,13 @@ function HeroData:calcAttr()
self.allAtkpAttr[matchType][k] = (self.allAtkpAttr[matchType][k] or 0) + v self.allAtkpAttr[matchType][k] = (self.allAtkpAttr[matchType][k] or 0) + v
end end
end end
for k, v in pairs(self.allAtkpAttrByTalent) do
for matchType = 1, 5 do
self.allAtkpAttr[matchType] = self.allAtkpAttr[matchType] or {}
self.allAtkpAttr[matchType][k] = (self.allAtkpAttr[matchType][k] or 0) + v
end
end
end end
-- endregion -- endregion

146
lua/app/userdata/hero/hero_entity.lua
View File

@ -22,13 +22,14 @@ end
-- region 属性 -- region 属性
function HeroEntity:initAttr() function HeroEntity:initAttr()
self:setTotalAttrValue(ATTR_NAME.HP, 0) self.allBaseAttr[ATTR_NAME.HP] = 0
self:setTotalAttrValue(ATTR_NAME.ATK, 0) self.allBaseAttr[ATTR_NAME.ATK] = 0
self:setTotalAttrValue(ATTR_NAME.ATK_RED, 0) self.allBaseAttr[ATTR_NAME.ATK_RED] = 0
self:setTotalAttrValue(ATTR_NAME.ATK_YELLOW, 0) self.allBaseAttr[ATTR_NAME.ATK_YELLOW] = 0
self:setTotalAttrValue(ATTR_NAME.ATK_GREEN, 0) self.allBaseAttr[ATTR_NAME.ATK_GREEN] = 0
self:setTotalAttrValue(ATTR_NAME.ATK_BLUE, 0) self.allBaseAttr[ATTR_NAME.ATK_BLUE] = 0
self:setTotalAttrValue(ATTR_NAME.ATK_PURPLE, 0) self.allBaseAttr[ATTR_NAME.ATK_PURPLE] = 0
self.allBaseAttr[ATTR_NAME.DMGDEC] = 0
self:_updateAllBaseAttr() self:_updateAllBaseAttr()
end end
@ -78,18 +79,63 @@ function HeroEntity:_updateAllAttr()
for k, v in pairs(self.allBaseAttr) do for k, v in pairs(self.allBaseAttr) do
self.allAttr[k] = v self.allAttr[k] = v
end end
-- GConst.ALL_ATTR = {
-- ATTR_ATK_ALL = "atk_all", -- 全体英雄攻击（固定值）
-- ATTR_HP_ALL = "attr_hp_all", -- 全体英雄生命（固定值）
-- ATTR_DMGDEC_ALL = "attr_dmgdec_all", -- 全体减伤（固定值）
-- ATTR_CRIT_ALL = "attr_crit_all", -- 全体暴击率
-- ATTR_CRIT_TIME_ALL = "attr_crit_time_all", -- 全体暴击伤害
-- ATTR_NORMAL_HURTP_ALL = "attr_normal_hurtp_all",-- 全体普攻增伤（百分比）
-- ATTR_SKILL_HURTP_ALL = "attr_skill_hurtp_all", -- 全体技能增伤（百分比）
-- ATTR_ATKP_ALL = "attr_atkp_all", -- 全体攻击（百分比）
-- }
-- 同属性通用加成
self.allAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = nil self.allAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = nil
self.allAttr[GConst.ALL_ATTR.ATTR_ATK_ALL] = nil
self.allAttr[GConst.ALL_ATTR.ATTR_HP_ALL] = nil
self.allAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = nil
self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = nil
self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = nil
self.allAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = nil
self.allAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = nil
self.allAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = nil
-- 攻击力（百分比） -- 攻击力（百分比）
local atkType = GConst.MATCH_ATTACK_NAME[self:getMatchType()] local atkType = GConst.MATCH_ATTACK_NAME[self:getMatchType()]
local allAtk = DataManager.HeroData:getAttrByMatchType(self:getMatchType(), GConst.ALL_ATTR.ATTR_ATK_ALL)
local atkpType = GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()] local atkpType = GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]
local factorValue = DataManager.HeroData:getAttrByMatchType(self:getMatchType(), atkpType) local allFactorValue = DataManager.HeroData:getAttrByMatchType(self:getMatchType(), atkpType)
if factorValue > 0 then local factorValue = self.allAttr[GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]] or 0
self.allAttr[atkType] = math.floor(self.allAttr[atkType] * (1 + factorValue / GConst.DEFAULT_FACTOR) + 0.0000001) local allAtkP = self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_ATKP_ALL)
end local atk = self.allAttr[atkType] + allAtk
self.allAttr[atkType] = math.floor(atk * (1 + (factorValue + allFactorValue + allAtkP) / GConst.DEFAULT_FACTOR) + 0.0000001)
self.allAttr[GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]] = nil
-- 生命（百分比）
local hpType = GConst.MATCH_HP_NAME[self:getMatchType()]
local allHp = DataManager.HeroData:getAttrByMatchType(self:getMatchType(), GConst.ALL_ATTR.ATTR_HP_ALL)
-- local atkpType = GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]
-- local allFactorValue = DataManager.HeroData:getAttrByMatchType(self:getMatchType(), atkpType)
local factorValue = self.allAttr[GConst.MATCH_HP_ADD_NAME[self:getMatchType()]] or 0
local hp = self.allAttr[hpType] + allHp
self.allAttr[hpType] = math.floor(hp * (1 + factorValue / GConst.DEFAULT_FACTOR) + 0.0000001)
self.allAttr[GConst.MATCH_HP_ADD_NAME[self:getMatchType()]] = nil
self.allAttr[ATTR_NAME.DMGDEC] = (self.allAttr[ATTR_NAME.DMGDEC] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_DMGDEC_ALL)
self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_CRIT_ALL)
self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL)
self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL)
self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = (self.allAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] or 0) + self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL)
self:calcPower() self:calcPower()
end end
function HeroEntity:getGlobalAttrByType(attrType)
return DataManager.HeroData:getAttrByMatchType(self:getMatchType(), attrType) or 0
end
function HeroEntity:_getAllBaseAttr() function HeroEntity:_getAllBaseAttr()
if self.attrBaseDirty == true then if self.attrBaseDirty == true then
self.attrBaseDirty = false self.attrBaseDirty = false
@ -105,11 +151,22 @@ function HeroEntity:_updateAllBaseAttr()
self:_updateSkinAttr() self:_updateSkinAttr()
self:_updateTotalAttr() self:_updateTotalAttr()
if self.allBaseAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] ~= nil then -- 处理全局属性
local attr = {} local attr = {}
if self.allBaseAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] ~= nil then
attr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = self.allBaseAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] attr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] = self.allBaseAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]]
DataManager.HeroData:setHeroAttr(self:getCfgId(), attr)
end end
attr[GConst.ALL_ATTR.ATTR_ATK_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_ATK_ALL]
attr[GConst.ALL_ATTR.ATTR_HP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_HP_ALL]
attr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL]
attr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL]
attr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL]
attr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL]
attr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL]
attr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = self.allBaseAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL]
DataManager.HeroData:setHeroAttr(self:getCfgId(), attr)
end end
-- 更新英雄基础属性 -- 更新英雄基础属性
@ -180,74 +237,29 @@ end
function HeroEntity:_updateTotalAttr() function HeroEntity:_updateTotalAttr()
self.allBaseAttr = {} self.allBaseAttr = {}
for k, v in pairs(self.baseAttrOriginal) do for k, v in pairs(self.baseAttrOriginal) do
self:setTotalAttrValue(k, v) self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
end end
for k, v in pairs(self.starAttr) do for k, v in pairs(self.starAttr) do
self:addTotalAttrValue(k, v) self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
end end
for k, v in pairs(self.skinAttr) do for k, v in pairs(self.skinAttr) do
self:addTotalAttrValue(k, v) self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
end end
end end
function HeroEntity:setTotalAttrValue(name, value)
-- Logger.logHighlight("set "..name..":"..value)
self.allBaseAttr[name] = GFunc.encryptNumber(value or 0)
end
function HeroEntity:addTotalAttrValue(name, add)
-- Logger.logHighlight("add "..name..":"..add)
local before = self:getTotalAttrValue(name)
self.allBaseAttr[name] = GFunc.encryptNumber(before + (add or 0))
end
function HeroEntity:getTotalAttrValue(name) function HeroEntity:getTotalAttrValue(name)
if table.nums(self.allBaseAttr) <= 0 then local attr = self:getAllAttr()
self:initAttr() return attr[name] or 0
end
if not self.allBaseAttr[name] then
return 0
end
-- Logger.logHighlight("get "..name..":"..GFunc.decryptNumber(self.allBaseAttr[name]))
return GFunc.decryptNumber(self.allBaseAttr[name])
end
-- 获取总基础生命值（英雄+装备+皮肤）
function HeroEntity:getTotalBaseHp()
local result = self:isActived() and self:getCfgHp() or self:getCfgHp(self:getBeginLv())
result = result + DataManager.SkinData:getBaseHp(self)
return result
end
-- 获取总基础攻击值（英雄+装备+皮肤）
function HeroEntity:getTotalBaseAtk()
local result = self:isActived() and self:getCfgAtk() or self:getCfgAtk(self:getBeginLv())
-- local logStr = self:getCfgId() .. "总基础攻击值:\n英雄：" .. result
-- 武器 + 防具
-- for partName, partType in pairs(GConst.EquipConst.PART_TYPE) do
-- local HeroEntity = self:getEquips(partType)
-- if HeroEntity then
-- -- logStr = logStr .. "\n" .. partName .. "：" .. HeroEntity:getBaseAttack()
-- result = result + HeroEntity:getBaseAttack()
-- end
-- end
-- logStr = logStr .. "\nSKIN：" .. DataManager.SkinData:getBaseAttack(self)
result = result + DataManager.SkinData:getBaseAttack(self)
-- Logger.logHighlight(logStr)
return result
end end
function HeroEntity:getAtk() function HeroEntity:getAtk()
local atkName = GConst.MATCH_ATTACK_NAME[self:getMatchType()] local attr = self:getAllAttr()
local atkAddName = GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()] return attr[GConst.MATCH_ATTACK_NAME[self:getMatchType()]]
return self:getTotalAttrValue(atkName) + self:getTotalAttrValue(atkAddName)
end end
function HeroEntity:getHp() function HeroEntity:getHp()
local hpName = ATTR_NAME.HP local attr = self:getAllAttr()
local hpAddName = GConst.MATCH_HP_ADD_NAME[self:getMatchType()] return attr[GConst.MATCH_HP_NAME[self:getMatchType()]]
return self:getTotalAttrValue(hpName) + self:getTotalAttrValue(hpAddName)
end end
function HeroEntity:getCfgHp(lv) function HeroEntity:getCfgHp(lv)

44
lua/app/userdata/talent/talent_data.lua
View File

@ -15,6 +15,10 @@ function TalentData:init(data)
data = data or GConst.EMPTY_TABLE data = data or GConst.EMPTY_TABLE
self.stage = data.stage self.stage = data.stage
self.levels = data.levels or {} self.levels = data.levels or {}
self.allAttr = {}
self.attrDirty = true
self:getAllAttr()
end end
function TalentData:clear() function TalentData:clear()
@ -51,6 +55,7 @@ function TalentData:onUpgrade(data)
self.upData = data self.upData = data
self.stage = data.stage self.stage = data.stage
self.levels[data.id] = data.level self.levels[data.id] = data.level
self.attrDirty = true
self:setDirty() self:setDirty()
end end
@ -83,20 +88,39 @@ function TalentData:getAttrById(id)
end end
function TalentData:getAllAttr() function TalentData:getAllAttr()
local allAttr = {} if self.attrDirty == true then
self.attrDirty = false
self:_updateAllAttr()
end
return self.allAttr
end
function TalentData:_updateAllAttr()
self.allAttr = {}
for id = 1, #TalentCfg do for id = 1, #TalentCfg do
local cfg = TalentCfg[id] local cfg = TalentCfg[id]
local lv = self:getLevels(id) local lv = self:getLevels(id)
if cfg.attr then if lv and lv > 0 and cfg.attr then
for _,v in ipairs(cfg.attr) do for _, v in ipairs(cfg.attr) do
self.allAttr[v.type] = (self.allAttr[v.type] or 0) + v.num
end
end
end
-- 处理全局属性
local attr = {} local attr = {}
attr.type = v.type attr[GConst.ALL_ATTR.ATTR_ATK_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_ATK_ALL]
attr.num = v.num * lv attr[GConst.ALL_ATTR.ATTR_HP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_HP_ALL]
table.insert(allAttr, attr) attr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL]
end attr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL]
end attr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL]
end attr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL]
return allAttr attr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_SKILL_HURTP_ALL]
attr[GConst.ALL_ATTR.ATTR_ATKP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_ATKP_ALL]
DataManager.HeroData:setTalentAttr(attr)
return self.allAttr
end end
--@endregion --@endregion
return TalentData return TalentData