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

Merge branch 'dev_hero' into dev_equip

Browse Source
This commit is contained in:
puxuan 2025-09-19 14:51:57 +08:00
commit 3d1a5203a7
24 changed files with 926 additions and 651 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.EquipData:init(data.equip)
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.BagData:init(data.bag)
-- self.DungeonData:initDungeonWeapon(data.chapter_weapon_challenge)
@ -197,7 +198,6 @@ function DataManager:initWithServerData(data)
end
self.HeroFundData:init(data.hero_fund)
self.FourteenDayData:init(data.fourteen_bounty)
self.TalentData:init(data.talent)
-- 任务数据最后初始化,依赖其他模块的数据
self.TaskData:init()

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

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

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

@ -5,8 +5,8 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
@ -24,47 +24,55 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["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=",
["id"]=21,
["id_for_nothing"]="VAk=",
["num"]=1,
["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_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
["id"]=21,
["id_for_nothing"]="VAk=",
["num"]=1,
["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_for_nothing"]="Vw==",
@ -76,10 +84,18 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=15,
["num_for_nothing"]="Vw0="
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["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_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
@ -104,8 +120,8 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=11,
["num_for_nothing"]="Vwk="
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["task_daily_challenge"]={
@ -113,47 +129,55 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["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=",
["id"]=21,
["id_for_nothing"]="VAk=",
["num"]=1,
["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_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
["id"]=22,
["id_for_nothing"]="VAo=",
["num"]=2,
["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_for_nothing"]="Vw==",
@ -165,10 +189,18 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=16,
["num_for_nothing"]="Vw4="
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["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_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
@ -193,56 +225,64 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=12,
["num_for_nothing"]="Vwo="
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["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_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
["num"]=500,
["num_for_nothing"]="Uwhc"
}
},
{
{
["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=",
["id"]=23,
["id_for_nothing"]="VAs=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
["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_for_nothing"]="Vw==",
@ -254,10 +294,18 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=17,
["num_for_nothing"]="Vw8="
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["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_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
@ -282,8 +330,8 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=13,
["num_for_nothing"]="Vws="
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["task_daily_challenge"]={
@ -291,47 +339,55 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["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=",
["id"]=23,
["id_for_nothing"]="VAs=",
["num"]=1,
["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_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
["id"]=23,
["id_for_nothing"]="VAs=",
["num"]=1,
["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_for_nothing"]="Vw==",
@ -343,10 +399,18 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=18,
["num_for_nothing"]="VwA="
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["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_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
@ -371,56 +435,64 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=14,
["num_for_nothing"]="Vww="
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["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_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
["num"]=500,
["num_for_nothing"]="Uwhc"
}
},
{
{
["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=",
["id"]=24,
["id_for_nothing"]="VAw=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
["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_for_nothing"]="Vw==",
@ -432,10 +504,18 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=19,
["num_for_nothing"]="VwE="
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["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_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
@ -460,8 +540,8 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=15,
["num_for_nothing"]="Vw0="
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["task_daily_challenge"]={
@ -469,47 +549,55 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["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=",
["id"]=24,
["id_for_nothing"]="VAw=",
["num"]=1,
["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_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
["id"]=25,
["id_for_nothing"]="VA0=",
["num"]=1,
["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_for_nothing"]="Vw==",
@ -521,10 +609,18 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=20,
["num_for_nothing"]="VAg="
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["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_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
@ -549,8 +645,8 @@ local daily_challenge_level = {
["type_for_nothing"]="Vw==",
["id"]=19,
["id_for_nothing"]="VwE=",
["num"]=16,
["num_for_nothing"]="Vw4="
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
["task_daily_challenge"]={
@ -558,47 +654,55 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["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=",
["id"]=25,
["id_for_nothing"]="VA0=",
["num"]=1,
["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_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
["id"]=26,
["id_for_nothing"]="VA4=",
["num"]=1,
["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_for_nothing"]="Vw==",
@ -610,10 +714,18 @@ local daily_challenge_level = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=21,
["num_for_nothing"]="VAk="
["id"]=20,
["id_for_nothing"]="VAg=",
["num"]=100,
["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 = {
[111]={
["type"]=1,
["qlt"]=1,
["qlt"]=2,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -46,7 +46,7 @@ local equip = {
},
[112]={
["type"]=1,
["qlt"]=1,
["qlt"]=2,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -91,7 +91,7 @@ local equip = {
},
[121]={
["type"]=1,
["qlt"]=2,
["qlt"]=3,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -136,7 +136,7 @@ local equip = {
},
[122]={
["type"]=1,
["qlt"]=2,
["qlt"]=3,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -181,7 +181,7 @@ local equip = {
},
[123]={
["type"]=1,
["qlt"]=2,
["qlt"]=3,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -226,7 +226,7 @@ local equip = {
},
[131]={
["type"]=1,
["qlt"]=3,
["qlt"]=4,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -271,7 +271,7 @@ local equip = {
},
[132]={
["type"]=1,
["qlt"]=3,
["qlt"]=4,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -316,7 +316,7 @@ local equip = {
},
[133]={
["type"]=1,
["qlt"]=3,
["qlt"]=4,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -361,7 +361,7 @@ local equip = {
},
[134]={
["type"]=1,
["qlt"]=3,
["qlt"]=4,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -406,7 +406,7 @@ local equip = {
},
[141]={
["type"]=1,
["qlt"]=4,
["qlt"]=5,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -451,7 +451,7 @@ local equip = {
},
[142]={
["type"]=1,
["qlt"]=4,
["qlt"]=5,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -496,7 +496,7 @@ local equip = {
},
[143]={
["type"]=1,
["qlt"]=4,
["qlt"]=5,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -541,7 +541,7 @@ local equip = {
},
[144]={
["type"]=1,
["qlt"]=4,
["qlt"]=5,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -586,7 +586,7 @@ local equip = {
},
[145]={
["type"]=1,
["qlt"]=4,
["qlt"]=5,
["star"]=5,
["base_attr"]={
["type"]="attr_hp",
@ -631,7 +631,7 @@ local equip = {
},
[151]={
["type"]=1,
["qlt"]=5,
["qlt"]=6,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -676,7 +676,7 @@ local equip = {
},
[152]={
["type"]=1,
["qlt"]=5,
["qlt"]=6,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -721,7 +721,7 @@ local equip = {
},
[153]={
["type"]=1,
["qlt"]=5,
["qlt"]=6,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -766,7 +766,7 @@ local equip = {
},
[154]={
["type"]=1,
["qlt"]=5,
["qlt"]=6,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -811,7 +811,7 @@ local equip = {
},
[155]={
["type"]=1,
["qlt"]=5,
["qlt"]=6,
["star"]=5,
["base_attr"]={
["type"]="attr_hp",
@ -856,7 +856,7 @@ local equip = {
},
[211]={
["type"]=2,
["qlt"]=1,
["qlt"]=2,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -901,7 +901,7 @@ local equip = {
},
[212]={
["type"]=2,
["qlt"]=1,
["qlt"]=2,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -946,7 +946,7 @@ local equip = {
},
[221]={
["type"]=2,
["qlt"]=2,
["qlt"]=3,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -991,7 +991,7 @@ local equip = {
},
[222]={
["type"]=2,
["qlt"]=2,
["qlt"]=3,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -1036,7 +1036,7 @@ local equip = {
},
[223]={
["type"]=2,
["qlt"]=2,
["qlt"]=3,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -1081,7 +1081,7 @@ local equip = {
},
[231]={
["type"]=2,
["qlt"]=3,
["qlt"]=4,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -1126,7 +1126,7 @@ local equip = {
},
[232]={
["type"]=2,
["qlt"]=3,
["qlt"]=4,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -1171,7 +1171,7 @@ local equip = {
},
[233]={
["type"]=2,
["qlt"]=3,
["qlt"]=4,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -1216,7 +1216,7 @@ local equip = {
},
[234]={
["type"]=2,
["qlt"]=3,
["qlt"]=4,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -1261,7 +1261,7 @@ local equip = {
},
[241]={
["type"]=2,
["qlt"]=4,
["qlt"]=5,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -1306,7 +1306,7 @@ local equip = {
},
[242]={
["type"]=2,
["qlt"]=4,
["qlt"]=5,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -1351,7 +1351,7 @@ local equip = {
},
[243]={
["type"]=2,
["qlt"]=4,
["qlt"]=5,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -1396,7 +1396,7 @@ local equip = {
},
[244]={
["type"]=2,
["qlt"]=4,
["qlt"]=5,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -1441,7 +1441,7 @@ local equip = {
},
[245]={
["type"]=2,
["qlt"]=4,
["qlt"]=5,
["star"]=5,
["base_attr"]={
["type"]="attr_atk",
@ -1486,7 +1486,7 @@ local equip = {
},
[251]={
["type"]=2,
["qlt"]=5,
["qlt"]=6,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -1531,7 +1531,7 @@ local equip = {
},
[252]={
["type"]=2,
["qlt"]=5,
["qlt"]=6,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -1576,7 +1576,7 @@ local equip = {
},
[253]={
["type"]=2,
["qlt"]=5,
["qlt"]=6,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -1621,7 +1621,7 @@ local equip = {
},
[254]={
["type"]=2,
["qlt"]=5,
["qlt"]=6,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -1666,7 +1666,7 @@ local equip = {
},
[255]={
["type"]=2,
["qlt"]=5,
["qlt"]=6,
["star"]=5,
["base_attr"]={
["type"]="attr_atk",
@ -1711,7 +1711,7 @@ local equip = {
},
[311]={
["type"]=3,
["qlt"]=1,
["qlt"]=2,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -1756,7 +1756,7 @@ local equip = {
},
[312]={
["type"]=3,
["qlt"]=1,
["qlt"]=2,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -1801,7 +1801,7 @@ local equip = {
},
[321]={
["type"]=3,
["qlt"]=2,
["qlt"]=3,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -1846,7 +1846,7 @@ local equip = {
},
[322]={
["type"]=3,
["qlt"]=2,
["qlt"]=3,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -1891,7 +1891,7 @@ local equip = {
},
[323]={
["type"]=3,
["qlt"]=2,
["qlt"]=3,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -1936,7 +1936,7 @@ local equip = {
},
[331]={
["type"]=3,
["qlt"]=3,
["qlt"]=4,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -1981,7 +1981,7 @@ local equip = {
},
[332]={
["type"]=3,
["qlt"]=3,
["qlt"]=4,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -2026,7 +2026,7 @@ local equip = {
},
[333]={
["type"]=3,
["qlt"]=3,
["qlt"]=4,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -2071,7 +2071,7 @@ local equip = {
},
[334]={
["type"]=3,
["qlt"]=3,
["qlt"]=4,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -2116,7 +2116,7 @@ local equip = {
},
[341]={
["type"]=3,
["qlt"]=4,
["qlt"]=5,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -2161,7 +2161,7 @@ local equip = {
},
[342]={
["type"]=3,
["qlt"]=4,
["qlt"]=5,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -2206,7 +2206,7 @@ local equip = {
},
[343]={
["type"]=3,
["qlt"]=4,
["qlt"]=5,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -2251,7 +2251,7 @@ local equip = {
},
[344]={
["type"]=3,
["qlt"]=4,
["qlt"]=5,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -2296,7 +2296,7 @@ local equip = {
},
[345]={
["type"]=3,
["qlt"]=4,
["qlt"]=5,
["star"]=5,
["base_attr"]={
["type"]="attr_hp",
@ -2341,7 +2341,7 @@ local equip = {
},
[351]={
["type"]=3,
["qlt"]=5,
["qlt"]=6,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -2386,7 +2386,7 @@ local equip = {
},
[352]={
["type"]=3,
["qlt"]=5,
["qlt"]=6,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -2431,7 +2431,7 @@ local equip = {
},
[353]={
["type"]=3,
["qlt"]=5,
["qlt"]=6,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -2476,7 +2476,7 @@ local equip = {
},
[354]={
["type"]=3,
["qlt"]=5,
["qlt"]=6,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -2521,7 +2521,7 @@ local equip = {
},
[355]={
["type"]=3,
["qlt"]=5,
["qlt"]=6,
["star"]=5,
["base_attr"]={
["type"]="attr_hp",
@ -2566,7 +2566,7 @@ local equip = {
},
[411]={
["type"]=4,
["qlt"]=1,
["qlt"]=2,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -2611,7 +2611,7 @@ local equip = {
},
[412]={
["type"]=4,
["qlt"]=1,
["qlt"]=2,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -2656,7 +2656,7 @@ local equip = {
},
[421]={
["type"]=4,
["qlt"]=2,
["qlt"]=3,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -2701,7 +2701,7 @@ local equip = {
},
[422]={
["type"]=4,
["qlt"]=2,
["qlt"]=3,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -2746,7 +2746,7 @@ local equip = {
},
[423]={
["type"]=4,
["qlt"]=2,
["qlt"]=3,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -2791,7 +2791,7 @@ local equip = {
},
[431]={
["type"]=4,
["qlt"]=3,
["qlt"]=4,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -2836,7 +2836,7 @@ local equip = {
},
[432]={
["type"]=4,
["qlt"]=3,
["qlt"]=4,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -2881,7 +2881,7 @@ local equip = {
},
[433]={
["type"]=4,
["qlt"]=3,
["qlt"]=4,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -2926,7 +2926,7 @@ local equip = {
},
[434]={
["type"]=4,
["qlt"]=3,
["qlt"]=4,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -2971,7 +2971,7 @@ local equip = {
},
[441]={
["type"]=4,
["qlt"]=4,
["qlt"]=5,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -3016,7 +3016,7 @@ local equip = {
},
[442]={
["type"]=4,
["qlt"]=4,
["qlt"]=5,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -3061,7 +3061,7 @@ local equip = {
},
[443]={
["type"]=4,
["qlt"]=4,
["qlt"]=5,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -3106,7 +3106,7 @@ local equip = {
},
[444]={
["type"]=4,
["qlt"]=4,
["qlt"]=5,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -3151,7 +3151,7 @@ local equip = {
},
[445]={
["type"]=4,
["qlt"]=4,
["qlt"]=5,
["star"]=5,
["base_attr"]={
["type"]="attr_hp",
@ -3196,7 +3196,7 @@ local equip = {
},
[451]={
["type"]=4,
["qlt"]=5,
["qlt"]=6,
["star"]=1,
["base_attr"]={
["type"]="attr_hp",
@ -3241,7 +3241,7 @@ local equip = {
},
[452]={
["type"]=4,
["qlt"]=5,
["qlt"]=6,
["star"]=2,
["base_attr"]={
["type"]="attr_hp",
@ -3286,7 +3286,7 @@ local equip = {
},
[453]={
["type"]=4,
["qlt"]=5,
["qlt"]=6,
["star"]=3,
["base_attr"]={
["type"]="attr_hp",
@ -3331,7 +3331,7 @@ local equip = {
},
[454]={
["type"]=4,
["qlt"]=5,
["qlt"]=6,
["star"]=4,
["base_attr"]={
["type"]="attr_hp",
@ -3376,7 +3376,7 @@ local equip = {
},
[455]={
["type"]=4,
["qlt"]=5,
["qlt"]=6,
["star"]=5,
["base_attr"]={
["type"]="attr_hp",
@ -3421,7 +3421,7 @@ local equip = {
},
[511]={
["type"]=5,
["qlt"]=1,
["qlt"]=2,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -3466,7 +3466,7 @@ local equip = {
},
[512]={
["type"]=5,
["qlt"]=1,
["qlt"]=2,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -3511,7 +3511,7 @@ local equip = {
},
[521]={
["type"]=5,
["qlt"]=2,
["qlt"]=3,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -3556,7 +3556,7 @@ local equip = {
},
[522]={
["type"]=5,
["qlt"]=2,
["qlt"]=3,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -3601,7 +3601,7 @@ local equip = {
},
[523]={
["type"]=5,
["qlt"]=2,
["qlt"]=3,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -3646,7 +3646,7 @@ local equip = {
},
[531]={
["type"]=5,
["qlt"]=3,
["qlt"]=4,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -3691,7 +3691,7 @@ local equip = {
},
[532]={
["type"]=5,
["qlt"]=3,
["qlt"]=4,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -3736,7 +3736,7 @@ local equip = {
},
[533]={
["type"]=5,
["qlt"]=3,
["qlt"]=4,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -3781,7 +3781,7 @@ local equip = {
},
[534]={
["type"]=5,
["qlt"]=3,
["qlt"]=4,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -3826,7 +3826,7 @@ local equip = {
},
[541]={
["type"]=5,
["qlt"]=4,
["qlt"]=5,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -3871,7 +3871,7 @@ local equip = {
},
[542]={
["type"]=5,
["qlt"]=4,
["qlt"]=5,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -3916,7 +3916,7 @@ local equip = {
},
[543]={
["type"]=5,
["qlt"]=4,
["qlt"]=5,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -3961,7 +3961,7 @@ local equip = {
},
[544]={
["type"]=5,
["qlt"]=4,
["qlt"]=5,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -4006,7 +4006,7 @@ local equip = {
},
[545]={
["type"]=5,
["qlt"]=4,
["qlt"]=5,
["star"]=5,
["base_attr"]={
["type"]="attr_atk",
@ -4051,7 +4051,7 @@ local equip = {
},
[551]={
["type"]=5,
["qlt"]=5,
["qlt"]=6,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -4096,7 +4096,7 @@ local equip = {
},
[552]={
["type"]=5,
["qlt"]=5,
["qlt"]=6,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -4141,7 +4141,7 @@ local equip = {
},
[553]={
["type"]=5,
["qlt"]=5,
["qlt"]=6,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -4186,7 +4186,7 @@ local equip = {
},
[554]={
["type"]=5,
["qlt"]=5,
["qlt"]=6,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -4231,7 +4231,7 @@ local equip = {
},
[555]={
["type"]=5,
["qlt"]=5,
["qlt"]=6,
["star"]=5,
["base_attr"]={
["type"]="attr_atk",
@ -4276,7 +4276,7 @@ local equip = {
},
[611]={
["type"]=6,
["qlt"]=1,
["qlt"]=2,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -4321,7 +4321,7 @@ local equip = {
},
[612]={
["type"]=6,
["qlt"]=1,
["qlt"]=2,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -4366,7 +4366,7 @@ local equip = {
},
[621]={
["type"]=6,
["qlt"]=2,
["qlt"]=3,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -4411,7 +4411,7 @@ local equip = {
},
[622]={
["type"]=6,
["qlt"]=2,
["qlt"]=3,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -4456,7 +4456,7 @@ local equip = {
},
[623]={
["type"]=6,
["qlt"]=2,
["qlt"]=3,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -4501,7 +4501,7 @@ local equip = {
},
[631]={
["type"]=6,
["qlt"]=3,
["qlt"]=4,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -4546,7 +4546,7 @@ local equip = {
},
[632]={
["type"]=6,
["qlt"]=3,
["qlt"]=4,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -4591,7 +4591,7 @@ local equip = {
},
[633]={
["type"]=6,
["qlt"]=3,
["qlt"]=4,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -4636,7 +4636,7 @@ local equip = {
},
[634]={
["type"]=6,
["qlt"]=3,
["qlt"]=4,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -4681,7 +4681,7 @@ local equip = {
},
[641]={
["type"]=6,
["qlt"]=4,
["qlt"]=5,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -4726,7 +4726,7 @@ local equip = {
},
[642]={
["type"]=6,
["qlt"]=4,
["qlt"]=5,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -4771,7 +4771,7 @@ local equip = {
},
[643]={
["type"]=6,
["qlt"]=4,
["qlt"]=5,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -4816,7 +4816,7 @@ local equip = {
},
[644]={
["type"]=6,
["qlt"]=4,
["qlt"]=5,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -4861,7 +4861,7 @@ local equip = {
},
[645]={
["type"]=6,
["qlt"]=4,
["qlt"]=5,
["star"]=5,
["base_attr"]={
["type"]="attr_atk",
@ -4906,7 +4906,7 @@ local equip = {
},
[651]={
["type"]=6,
["qlt"]=5,
["qlt"]=6,
["star"]=1,
["base_attr"]={
["type"]="attr_atk",
@ -4951,7 +4951,7 @@ local equip = {
},
[652]={
["type"]=6,
["qlt"]=5,
["qlt"]=6,
["star"]=2,
["base_attr"]={
["type"]="attr_atk",
@ -4996,7 +4996,7 @@ local equip = {
},
[653]={
["type"]=6,
["qlt"]=5,
["qlt"]=6,
["star"]=3,
["base_attr"]={
["type"]="attr_atk",
@ -5041,7 +5041,7 @@ local equip = {
},
[654]={
["type"]=6,
["qlt"]=5,
["qlt"]=6,
["star"]=4,
["base_attr"]={
["type"]="attr_atk",
@ -5086,7 +5086,7 @@ local equip = {
},
[655]={
["type"]=6,
["qlt"]=5,
["qlt"]=6,
["star"]=5,
["base_attr"]={
["type"]="attr_atk",

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

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

35
lua/app/config/grid_type.lua
View File

@ -18,7 +18,8 @@ local grid_type = {
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b01"
},
[3]={
["icon"]="battle_obstacle_huoshanshi_1",
@ -30,7 +31,8 @@ local grid_type = {
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b02"
},
[4]={
["icon"]="battle_obstacle_huoshanshi_2",
@ -42,7 +44,8 @@ local grid_type = {
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b02"
},
[5]={
["icon"]="battle_obstacle_tengman",
@ -52,12 +55,14 @@ local grid_type = {
3
},
["break_count"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b04"
},
[6]={
["icon"]="battle_obstacle_lock",
["can_fall"]=1,
["cant_link"]=1
["cant_link"]=1,
["break_sfx"]="sfx_piece_za_b08"
},
[7]={
["icon"]="battle_obstacle_suishi_1",
@ -69,7 +74,8 @@ local grid_type = {
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b03"
},
[8]={
["icon"]="battle_obstacle_suishi_2",
@ -81,7 +87,8 @@ local grid_type = {
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b03"
},
[9]={
["icon"]="battle_obstacle_bingkuai",
@ -93,7 +100,8 @@ local grid_type = {
["break_count"]=1,
["break_stay_element"]=1,
["cant_link"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b05"
},
[10]={
["icon"]="battle_obstacle_chushou",
@ -103,7 +111,8 @@ local grid_type = {
3
},
["break_count"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b06"
},
[11]={
["icon"]="battle_obstacle_jizhuangxiang_2",
@ -115,7 +124,8 @@ local grid_type = {
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b07"
},
[12]={
["icon"]="battle_obstacle_jizhuangxiang_1",
@ -127,7 +137,8 @@ local grid_type = {
["break_count"]=1,
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b07"
},
[14]={
["icon"]="battle_obstacle_shenxiang",
@ -143,6 +154,7 @@ local grid_type = {
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_shenxiang_b01",
["effect"]=3,
["effect_trigger"]=2
},
@ -164,6 +176,7 @@ local grid_type = {
["cant_link"]=1,
["element_invalid"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_baoxiang_b01",
["effect"]=4,
["effect_trigger"]=2
},

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

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

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

@ -349,7 +349,7 @@ local skill_rogue = {
[24]={
["universal"]=1,
["limit_times"]=2,
["weight"]=2000,
["weight"]=0,
["qlt"]=3,
["type"]=9,
["effect"]={
@ -382,7 +382,7 @@ local skill_rogue = {
["universal"]=1,
["toast_mark"]=11,
["limit_times"]=3,
["weight"]=2000,
["weight"]=0,
["qlt"]=3,
["type"]=5,
["attr"]={
@ -425,7 +425,7 @@ local skill_rogue = {
},
[29]={
["universal"]=1,
["weight"]=3000,
["weight"]=0,
["qlt"]=3,
["type"]=9,
["effect"]={
@ -723,7 +723,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=17,
["type"]=18,
["parameter"]={
1300114,
1300115
@ -1724,7 +1724,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=6,
["type"]=17,
["type"]=18,
["parameter"]={
1600114,
1600115
@ -1799,7 +1799,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=6,
["type"]=17,
["type"]=18,
["parameter"]={
1600124,
1600125
@ -1816,7 +1816,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=6,
["type"]=17,
["type"]=18,
["parameter"]={
1600124,
1600125,
@ -2035,7 +2035,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=17,
["type"]=18,
["parameter"]={
2300114,
2300115
@ -2098,7 +2098,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=17,
["type"]=18,
["parameter"]={
2300124,
2300125
@ -2114,7 +2114,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=17,
["type"]=18,
["parameter"]={
2300124,
2300125,
@ -2331,7 +2331,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
2400114,
2400115
@ -2602,7 +2602,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
2500114,
2500115
@ -2912,7 +2912,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
2500224,
2500226
@ -2928,7 +2928,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
2500225,
2500226
@ -3001,7 +3001,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
2500234,
2500236
@ -3014,7 +3014,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
2500235,
2500236
@ -3210,7 +3210,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=6,
["type"]=17,
["type"]=18,
["parameter"]={
2600124,
2600125
@ -3410,7 +3410,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=17,
["type"]=18,
["parameter"]={
3300114,
3300115
@ -3612,7 +3612,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=17,
["type"]=18,
["parameter"]={
3300144,
3300145
@ -3692,7 +3692,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
3400114,
3400115
@ -3755,7 +3755,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
3400124,
3400125
@ -3771,7 +3771,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
3400124,
3400126
@ -3869,7 +3869,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
3400134,
3400135
@ -4011,7 +4011,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
3500114,
3500115
@ -4296,7 +4296,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
3500214,
3500215
@ -4788,7 +4788,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
4400114,
4400115
@ -4880,7 +4880,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
4400124,
4400125
@ -4964,7 +4964,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
4400134,
4400135
@ -5331,7 +5331,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
4500214,
4500215
@ -5403,7 +5403,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
4500223,
4500224
@ -5420,7 +5420,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
4500224,
4500225
@ -5591,7 +5591,7 @@ local skill_rogue = {
[5300111]={
["method"]=2,
["limit_times"]=1,
["weight"]=3000,
["weight"]=3000000000,
["qlt"]=3,
["type"]=2,
["skill_position"]=5,
@ -5611,7 +5611,7 @@ local skill_rogue = {
[5300112]={
["method"]=2,
["limit_times"]=1,
["weight"]=3000,
["weight"]=3000000000,
["qlt"]=3,
["type"]=2,
["skill_position"]=5,
@ -5638,9 +5638,9 @@ local skill_rogue = {
},
[5300113]={
["limit_times"]=1,
["weight"]=3000,
["weight"]=3000000000,
["qlt"]=3,
["type"]=17,
["type"]=18,
["parameter"]={
5300114,
5300115
@ -5679,7 +5679,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=0,
["qlt"]=3,
["type"]=18,
["type"]=19,
["parameter"]={
6,
1,
@ -5717,7 +5717,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=3,
["type"]=17,
["type"]=18,
["parameter"]={
5300124,
5300125
@ -5908,7 +5908,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
5400114,
5400115
@ -6000,7 +6000,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
5400124,
5400125
@ -6087,7 +6087,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=17,
["type"]=18,
["parameter"]={
5400134,
5400135
@ -6263,7 +6263,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
5500124,
5500125
@ -6276,7 +6276,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
5500124,
5500126
@ -6404,7 +6404,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
5500144,
5500145
@ -6417,7 +6417,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
5500144,
5500146
@ -6590,7 +6590,7 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=5,
["type"]=17,
["type"]=18,
["parameter"]={
5500224,
5500225

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

@ -15,83 +15,83 @@ local summon = {
["summon"]={
{
["id"]=13001,
["weight"]=177800
["weight"]=13800
},
{
["id"]=23001,
["weight"]=177800
["weight"]=13800
},
{
["id"]=33001,
["weight"]=177800
["weight"]=13800
},
{
["id"]=43001,
["weight"]=177800
["weight"]=13800
},
{
["id"]=53001,
["weight"]=177800
["weight"]=13800
},
{
["id"]=14001,
["weight"]=22180
["weight"]=6080
},
{
["id"]=24001,
["weight"]=22180
["weight"]=6080
},
{
["id"]=34001,
["weight"]=22180
["weight"]=6080
},
{
["id"]=44001,
["weight"]=22180
["weight"]=6080
},
{
["id"]=54001,
["weight"]=22180
["weight"]=6080
},
{
["id"]=15001,
["weight"]=10
["weight"]=60
},
{
["id"]=15002,
["weight"]=10
["weight"]=60
},
{
["id"]=25001,
["weight"]=10
["weight"]=60
},
{
["id"]=25002,
["weight"]=10
["weight"]=60
},
{
["id"]=35001,
["weight"]=10
["weight"]=60
},
{
["id"]=35002,
["weight"]=10
["weight"]=60
},
{
["id"]=45001,
["weight"]=10
["weight"]=60
},
{
["id"]=45002,
["weight"]=10
["weight"]=60
},
{
["id"]=55001,
["weight"]=10
["weight"]=60
},
{
["id"]=55002,
["weight"]=10
["weight"]=60
}
},
["hero_item"]={
@ -101,25 +101,25 @@ local summon = {
},
{
4,
12
15
},
{
5,
15
20
}
},
["show"]={
{
3,
8890
6900
},
{
4,
1109
3040
},
{
5,
1
60
}
}
},
@ -147,83 +147,83 @@ local summon = {
["summon"]={
{
["id"]=13001,
["weight"]=1250
["weight"]=13000
},
{
["id"]=23001,
["weight"]=1250
["weight"]=13000
},
{
["id"]=33001,
["weight"]=1250
["weight"]=13000
},
{
["id"]=43001,
["weight"]=1250
["weight"]=13000
},
{
["id"]=53001,
["weight"]=1250
["weight"]=13000
},
{
["id"]=14001,
["weight"]=500
["weight"]=5400
},
{
["id"]=24001,
["weight"]=500
["weight"]=5400
},
{
["id"]=34001,
["weight"]=500
["weight"]=5400
},
{
["id"]=44001,
["weight"]=500
["weight"]=5400
},
{
["id"]=54001,
["weight"]=500
["weight"]=5400
},
{
["id"]=15001,
["weight"]=125
["weight"]=800
},
{
["id"]=15002,
["weight"]=125
["weight"]=800
},
{
["id"]=25001,
["weight"]=125
["weight"]=800
},
{
["id"]=25002,
["weight"]=125
["weight"]=800
},
{
["id"]=35001,
["weight"]=125
["weight"]=800
},
{
["id"]=35002,
["weight"]=125
["weight"]=800
},
{
["id"]=45001,
["weight"]=125
["weight"]=800
},
{
["id"]=45002,
["weight"]=125
["weight"]=800
},
{
["id"]=55001,
["weight"]=125
["weight"]=800
},
{
["id"]=55002,
["weight"]=125
["weight"]=800
}
},
["hero_item"]={
@ -240,49 +240,6 @@ local summon = {
100
}
},
["guarantee1"]=50,
["guarantee_summon"]={
{
["id"]=15001,
["weight"]=1
},
{
["id"]=15002,
["weight"]=1
},
{
["id"]=25001,
["weight"]=1
},
{
["id"]=25002,
["weight"]=1
},
{
["id"]=35001,
["weight"]=1
},
{
["id"]=35002,
["weight"]=1
},
{
["id"]=45001,
["weight"]=1
},
{
["id"]=45002,
["weight"]=1
},
{
["id"]=55001,
["weight"]=1
},
{
["id"]=55002,
["weight"]=1
}
},
["guarantee3"]=0,
["guarantee2"]=100,
["love"]={
@ -300,15 +257,15 @@ local summon = {
["show"]={
{
3,
6250
6500
},
{
4,
2500
2700
},
{
5,
1250
800
}
}
},
@ -457,11 +414,11 @@ local summon = {
},
{
5,
1150
1000
},
{
6,
100
250
}
}
}

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

@ -675,6 +675,17 @@ GConst.MATCH_ALL_ATKP_NAME = {
[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 = {
DEFAULT = CS.BF.Utils.NameToLayer("Default"),
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_BLUE_ALL = "attr_atkp_blue_all",
ATTR_ATKP_PURPLE_ALL = "attr_atkp_purple_all",
DMGDEC = "dmgdec",
INVINCIBLE_SHIELD = "invincible_shield",
REBIRTH = "rebirth",

3
lua/app/module/battle/component/battle_unit_comp.lua
View File

@ -1420,7 +1420,8 @@ function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx)
end
end
local effectList = skill:getEffectList()
local linkNum = self.battleController.battleData:getLastSequenceLinkNum()
local effectList = skill:getEffectList(linkNum)
if effectList == nil then
return
end

7
lua/app/module/battle/controller/battle_base_controller.lua
View File

@ -1041,6 +1041,7 @@ end
function BattleBaseController:enterRoundBegin()
self.battleData:clearBreakGridEdgeTag()
self.battleData:clearLastSequenceLinkNum()
self:hideTouchCancel()
self:resetSideActionCount()
self:setCurActionSide(SIDE_ATK)
@ -2401,6 +2402,12 @@ end
function BattleBaseController:dealSelectSkill(skillId, value, side, isSnapshot)
side = side or self:getCurActionSide()
local cfg = ConfigManager:getConfig("skill_rogue")
local skillCfg = cfg[skillId]
if skillCfg.limit_times and self:getSkillCount(skillId) >= skillCfg.limit_times then
return
end
self.battleData:addSkillCount(skillId, value, side)
BATTLE_ROGUE_SKILL_HANDLE.takeEffect(skillId, self.battleData, self, value, side, isSnapshot)

58
lua/app/module/battle/skill/battle_rogue_skill_handle.lua
View File

@ -36,6 +36,10 @@ local _changeBaseSkill = function(skillId, skillInfo, battleBaseData, battleCont
for effectType, effect in pairs(skillEntity:getSkillRatioAdd()) do -- 技能效果概率
unitEntity:addSkillRatio(newSkillId, effect)
end
for effectType, effect in pairs(skillEntity:getLinkNumSkillRoundAdd()) do -- 带条件技能回合数
unitEntity:addLinkNumSkillEffectRound(newSkillId, effect)
end
end
end
end
@ -439,6 +443,58 @@ local _addSkillBreakEnergyMultiple = function(skillId, skillInfo, battleBaseData
end
end
local _addSkillMerge = function(skillId, skillInfo, battleBaseData, battleController, value, side)
if not skillInfo.parameter then
return
end
for i, v in ipairs(skillInfo.parameter) do
battleController:dealSelectSkill(v, value, side)
end
end
local _addSkillLinkNumRound = function(skillId, skillInfo, battleBaseData, battleController, value, side)
local elementType = skillInfo.skill_position
if not elementType or not skillInfo.parameter then
return
end
local linkNum = skillInfo.parameter[1]
local index = skillInfo.parameter[2]
local value = skillInfo.parameter[3]
if not linkNum or not index or not value then
return
end
local effect
local entity = battleBaseData:getSkillEntityByElement(elementType, side)
if entity and entity:getEffect() then
local effectCfg = entity:getEffect()[index]
if effectCfg then
effect = GFunc.getTable(effectCfg)
effect.round = effect.round + value
effect.linkNum = linkNum
end
end
if not effect then
return
end
local skillEntity = battleBaseData:getSkillEntityByElement(elementType, side)
if skillEntity then
local skillId = skillEntity:getSkillId()
skillEntity:addLinkNumSkillEffectRoundAdd(effect)
local actionTeam = battleBaseData:getTeamBySide(side)
if not actionTeam then
return
end
if actionTeam:getAllMembers()[elementType] then
actionTeam:getAllMembers()[elementType]:addLinkNumSkillEffectRound(skillId, effect)
end
end
end
BattleRogueSkillHandle._effectOn = {
[1] = _changeBaseSkill, -- 改变初始技能ID
[2] = _addEliminationRange, -- 增加消除数量
@ -457,6 +513,8 @@ BattleRogueSkillHandle._effectOn = {
[15] = _addLinkCountPowerEffect, -- 链接超过x元素获得倍数技能效果
[16] = _addSkillRatio, -- 增加技能效果概率
[17] = _addSkillBreakEnergyMultiple, -- 增加技能消除的元素的能量倍数
[18] = _addSkillMerge, -- 融合技能，参数配本表的ID，获得后直接让配的技能ID都生效
[19] = _addSkillLinkNumRound, -- 需要做成链接超X个元素时将主技能的第几个BUFF的回合数增加。参数配置[链接数,第几个BUFF，回合数加值]
}
function BattleRogueSkillHandle.takeEffect(skillId, battleData, battleController, value, side, isSnapshot)

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

@ -82,7 +82,7 @@ function MessageBox:showMessageBox(params)
prefabObject._closeByAndroidBackspace = true
end
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"]:addClickListener(function()
self:closeAndClear(prefabObject, uiMap)
@ -104,7 +104,7 @@ function MessageBox:showMessageBox(params)
end)
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.check.select"]:setVisible(false)
@ -120,7 +120,7 @@ function MessageBox:showMessageBox(params)
GFunc.centerImgAndTx(checkUI, textUI, 5)
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)
end
end)

9
lua/app/ui/summon/summon_main_ui.lua
View File

@ -382,8 +382,13 @@ function SummonMainUI:onSummonRsp(result, newHero)
self.vfx01s[i]:setActive(false)
self.vfx02s[i]:setActive(false)
end
local id = result.rewards[1].item.id
local qlt = DataManager.HeroData:getHeroQlt(id) - 2
local qlt = 3
for i, v in ipairs(result.rewards) do
local id = v.item.id
local q = DataManager.HeroData:getHeroQlt(id)
qlt = math.max(qlt, q)
end
qlt = qlt - 2
self.summonResult = result.rewards
self.aniSeq = self.root:createBindTweenSequence()
if self.vfxs[qlt] then

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

@ -388,12 +388,23 @@ function BattleBaseData:clearSkillInfluenceGrids()
end
function BattleBaseData:clearGridSequence()
if self.gridSequence then
self.lastSequenceLinkNum = #self.gridSequence
end
self.gridSequence = {} -- 格子队列
self.gridSequenceMap = {} -- 格子队列对应的map，方面查找
self.isVirtual = nil
self:clearSkillInfluenceGrids()
end
function BattleBaseData:getLastSequenceLinkNum()
return self.lastSequenceLinkNum
end
function BattleBaseData:clearLastSequenceLinkNum()
self.lastSequenceLinkNum = nil
end
function BattleBaseData:getGridEnties()
return self.gridEntities or {}
end
@ -805,13 +816,7 @@ function BattleBaseData:initHeroData(formation)
---- 攻击力
for matchType, attrName in pairs(GConst.MATCH_ATTACK_NAME) do
unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName)
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
unitData.attr[attrName] = heroEntity:getTotalAttrValue(attrName) // DEFAULT_FACTOR
end
---- 暴击率

9
lua/app/userdata/battle/skill/battle_board_skill_entity.lua
View File

@ -15,6 +15,7 @@ function BattleBoardSkillEntity:ctor(skillId, side)
self.skillEffectNumAdd = {} -- 技能效果参数增加 type = 7 用于技能替换时生效
self.skillRoundAdd = {} -- 技能效果回合增加 type = 8 用于技能替换时生效
self.skillRatioAdd = {} -- 技能效果概率增加 type = 16 用于技能替换时生效
self.skillLinkNumRoundAdd = {} -- 技能效果回合增加 type = 19 用于技能替换时生效
self.originSkillId = skillId
self.upSkillIdMap = {}
@ -491,6 +492,14 @@ function BattleBoardSkillEntity:getSkillRoundAdd()
return self.skillRoundAdd
end
function BattleBoardSkillEntity:addLinkNumSkillEffectRoundAdd(effect)
self.skillLinkNumRoundAdd[effect.type] = effect
end
function BattleBoardSkillEntity:getLinkNumSkillRoundAdd()
return self.skillLinkNumRoundAdd
end
function BattleBoardSkillEntity:addSkillRatioAdd(effect)
local effectInfo = self.skillRatioAdd[effect.type]
if effectInfo then

1
lua/app/userdata/battle/skill/battle_buff_entity.lua
View File

@ -12,6 +12,7 @@ function BattleBuffEntity:init(effectParams, owner, hostSkill)
self.effectNum = effectParams.num
self.round = effectParams.round
self.ratio = effectParams.ratio
self.linkNum = effectParams.linkNum
self.owner = owner
self.hostSkill = hostSkill
self.targetSide = nil

23
lua/app/userdata/battle/skill/battle_skill_entity.lua
View File

@ -174,6 +174,12 @@ function BattleSkillEntity:addSkillEffectRound(effect)
end
end
function BattleSkillEntity:addLinkNumSkillEffectRound(effect)
local buffEntity = BattleBuffEntity:create()
buffEntity:init(effect, self.owner, self)
self.effectLinkNum = buffEntity
end
function BattleSkillEntity:addSkillEffectRatio(effect)
local buffEntity
for _, entity in ipairs(self.effectList) do
@ -274,8 +280,23 @@ function BattleSkillEntity:getSkillAttackName()
return self.skillInfo.name_act
end
function BattleSkillEntity:getEffectList()
function BattleSkillEntity:getEffectList(linkNum)
if not self.effectLinkNum then
return self.effectList
end
local list = {}
for _, effect in ipairs(self.effectList) do
if linkNum and effect:getName() == self.effectLinkNum:getName() then
if linkNum >= self.effectLinkNum.linkNum then
table.insert(list, self.effectLinkNum)
else
table.insert(list, effect)
end
else
table.insert(list, effect)
end
end
return list
end
function BattleSkillEntity:getEffectBlock()

17
lua/app/userdata/battle/team/battle_unit_entity.lua
View File

@ -248,6 +248,23 @@ function BattleUnitEntity:addSkillRound(skillId, effect)
end
end
function BattleUnitEntity:addLinkNumSkillEffectRound(skillId, effect)
for _, skillEntity in ipairs(self.activeSkills) do
if skillEntity:getSkillId() == skillId then
skillEntity:addLinkNumSkillEffectRound(effect)
break
end
end
if self.passiveSkills then
for _, skillEntity in ipairs(self.passiveSkills) do
if skillEntity:getSkillId() == skillId then
skillEntity:addLinkNumSkillEffectRound(effect)
break
end
end
end
end
function BattleUnitEntity:addSkillRatio(skillId, effect)
for _, skillEntity in ipairs(self.activeSkills) do
if skillEntity:getSkillId() == skillId then

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

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

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

@ -22,13 +22,14 @@ end
-- region 属性
function HeroEntity:initAttr()
self:setTotalAttrValue(ATTR_NAME.HP, 0)
self:setTotalAttrValue(ATTR_NAME.ATK, 0)
self:setTotalAttrValue(ATTR_NAME.ATK_RED, 0)
self:setTotalAttrValue(ATTR_NAME.ATK_YELLOW, 0)
self:setTotalAttrValue(ATTR_NAME.ATK_GREEN, 0)
self:setTotalAttrValue(ATTR_NAME.ATK_BLUE, 0)
self:setTotalAttrValue(ATTR_NAME.ATK_PURPLE, 0)
self.allBaseAttr[ATTR_NAME.HP] = 0
self.allBaseAttr[ATTR_NAME.ATK] = 0
self.allBaseAttr[ATTR_NAME.ATK_RED] = 0
self.allBaseAttr[ATTR_NAME.ATK_YELLOW] = 0
self.allBaseAttr[ATTR_NAME.ATK_GREEN] = 0
self.allBaseAttr[ATTR_NAME.ATK_BLUE] = 0
self.allBaseAttr[ATTR_NAME.ATK_PURPLE] = 0
self.allBaseAttr[ATTR_NAME.DMGDEC] = 0
self:_updateAllBaseAttr()
end
@ -78,18 +79,63 @@ function HeroEntity:_updateAllAttr()
for k, v in pairs(self.allBaseAttr) do
self.allAttr[k] = v
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.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 allAtk = DataManager.HeroData:getAttrByMatchType(self:getMatchType(), GConst.ALL_ATTR.ATTR_ATK_ALL)
local atkpType = GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]
local factorValue = DataManager.HeroData:getAttrByMatchType(self:getMatchType(), atkpType)
if factorValue > 0 then
self.allAttr[atkType] = math.floor(self.allAttr[atkType] * (1 + factorValue / GConst.DEFAULT_FACTOR) + 0.0000001)
end
local allFactorValue = DataManager.HeroData:getAttrByMatchType(self:getMatchType(), atkpType)
local factorValue = self.allAttr[GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]] or 0
local allAtkP = self:getGlobalAttrByType(GConst.ALL_ATTR.ATTR_ATKP_ALL)
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()
end
function HeroEntity:getGlobalAttrByType(attrType)
return DataManager.HeroData:getAttrByMatchType(self:getMatchType(), attrType) or 0
end
function HeroEntity:_getAllBaseAttr()
if self.attrBaseDirty == true then
self.attrBaseDirty = false
@ -105,11 +151,22 @@ function HeroEntity:_updateAllBaseAttr()
self:_updateSkinAttr()
self:_updateTotalAttr()
if self.allBaseAttr[GConst.MATCH_ALL_ATKP_NAME[self:getMatchType()]] ~= nil then
-- 处理全局属性
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()]]
DataManager.HeroData:setHeroAttr(self:getCfgId(), attr)
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
-- 更新英雄基础属性
@ -180,74 +237,29 @@ end
function HeroEntity:_updateTotalAttr()
self.allBaseAttr = {}
for k, v in pairs(self.baseAttrOriginal) do
self:setTotalAttrValue(k, v)
self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
end
for k, v in pairs(self.starAttr) do
self:addTotalAttrValue(k, v)
self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
end
for k, v in pairs(self.skinAttr) do
self:addTotalAttrValue(k, v)
self.allBaseAttr[k] = (self.allBaseAttr[k] or 0) + v
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)
if table.nums(self.allBaseAttr) <= 0 then
self:initAttr()
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
local attr = self:getAllAttr()
return attr[name] or 0
end
function HeroEntity:getAtk()
local atkName = GConst.MATCH_ATTACK_NAME[self:getMatchType()]
local atkAddName = GConst.MATCH_ATTACK_ADD_NAME[self:getMatchType()]
return self:getTotalAttrValue(atkName) + self:getTotalAttrValue(atkAddName)
local attr = self:getAllAttr()
return attr[GConst.MATCH_ATTACK_NAME[self:getMatchType()]]
end
function HeroEntity:getHp()
local hpName = ATTR_NAME.HP
local hpAddName = GConst.MATCH_HP_ADD_NAME[self:getMatchType()]
return self:getTotalAttrValue(hpName) + self:getTotalAttrValue(hpAddName)
local attr = self:getAllAttr()
return attr[GConst.MATCH_HP_NAME[self:getMatchType()]]
end
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
self.stage = data.stage
self.levels = data.levels or {}
self.allAttr = {}
self.attrDirty = true
self:getAllAttr()
end
function TalentData:clear()
@ -51,6 +55,7 @@ function TalentData:onUpgrade(data)
self.upData = data
self.stage = data.stage
self.levels[data.id] = data.level
self.attrDirty = true
self:setDirty()
end
@ -83,20 +88,39 @@ function TalentData:getAttrById(id)
end
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
local cfg = TalentCfg[id]
local lv = self:getLevels(id)
if cfg.attr then
for _,v in ipairs(cfg.attr) do
if lv and lv > 0 and cfg.attr then
for _, v in ipairs(cfg.attr) do
self.allAttr[v.type] = (self.allAttr[v.type] or 0) + v.num
end
end
end
-- 处理全局属性
local attr = {}
attr.type = v.type
attr.num = v.num * lv
table.insert(allAttr, attr)
end
end
end
return allAttr
attr[GConst.ALL_ATTR.ATTR_ATK_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_ATK_ALL]
attr[GConst.ALL_ATTR.ATTR_HP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_HP_ALL]
attr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_DMGDEC_ALL]
attr[GConst.ALL_ATTR.ATTR_CRIT_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_ALL]
attr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_CRIT_TIME_ALL]
attr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL] = self.allAttr[GConst.ALL_ATTR.ATTR_NORMAL_HURTP_ALL]
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
--@endregion
return TalentData