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

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

Browse Source 
# Conflicts:
#	lua/app/global/global_const.lua
This commit is contained in:
CloudJ 2023-05-19 20:03:48 +08:00
commit 52bd3a3167
168 changed files with 18378 additions and 2158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lua/app/common/bi_report.lua
View File

@ -66,14 +66,17 @@ BIReport.ITEM_GET_TYPE = {
TASK_DAILY_REWARD = "TaskDailyReward", TASK_DAILY_REWARD = "TaskDailyReward",
BOUNTY_UNLOCK_LEVEL = "BountyUnlockLevel", BOUNTY_UNLOCK_LEVEL = "BountyUnlockLevel",
BOUNTY_REWARD = "BountyReward", BOUNTY_REWARD = "BountyReward",
BOUNTY = "Bounty" BOUNTY = "Bounty",
IDLE_DROP = "IdleDrop",
IDLE_QUICK_DROP = "IdleQuickDrop",
} }
BIReport.ADS_CLICK_TYPE = { BIReport.ADS_CLICK_TYPE = {
BATTLE_SKILL_REFRESH = "BattleSkillRefresh", BATTLE_SKILL_REFRESH = "BattleSkillRefresh",
AD_ENERGY = "AdEnergy", AD_ENERGY = "AdEnergy",
TASK_DAILY_REFRESH = "TaskDailyRefresh", TASK_DAILY_REFRESH = "TaskDailyRefresh",
TASK_DAILY_TASK = "TaskDailyTask" TASK_DAILY_TASK = "TaskDailyTask",
IDLE_QUICK_DROP = "IdleQuickDrop",
} }
BIReport.FIGHT_OPT_TYPE = { BIReport.FIGHT_OPT_TYPE = {

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

@ -13,11 +13,12 @@ function DataManager:init()
self:initManager("BattleData", "app/userdata/battle/battle_data") self:initManager("BattleData", "app/userdata/battle/battle_data")
self:initManager("FormationData", "app/userdata/formation/formation_data") self:initManager("FormationData", "app/userdata/formation/formation_data")
self:initManager("TutorialData", "app/userdata/tutorial/tutorial_data") self:initManager("TutorialData", "app/userdata/tutorial/tutorial_data")
self:initManager("MailData", "app/userdata/mail/mail_data")
self:initManager("ActivityData", "app/userdata/activity/activity_data") self:initManager("ActivityData", "app/userdata/activity/activity_data")
self:initManager("GodPigData", "app/userdata/activity/god_pig/god_pig_data") self:initManager("GodPigData", "app/userdata/activity/god_pig/god_pig_data")
self:initManager("BountyData", "app/userdata/bounty/bounty_data") self:initManager("BountyData", "app/userdata/bounty/bounty_data")
self:initManager("DailyTaskData", "app/userdata/task/daily_task_data") self:initManager("DailyTaskData", "app/userdata/task/daily_task_data")
-- self:initManager("IdleData", "app/userdata/idle/idle_data") self:initManager("IdleData", "app/userdata/idle/idle_data")
-- self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data") -- self:initManager("SevenDayData", "app/userdata/activity/seven_day/seven_day_data")
end end
@ -82,10 +83,11 @@ function DataManager:clear()
self.BagData:clear() self.BagData:clear()
self.FormationData:clear() self.FormationData:clear()
self.ActivityData:clear() self.ActivityData:clear()
self.MailData:clear()
self.GodPigData:clear() self.GodPigData:clear()
self.BountyData:clear() self.BountyData:clear()
self.DailyTaskData:clear() self.DailyTaskData:clear()
-- self.IdleData:clear() self.IdleData:clear()
-- self.SevenDayData:clear() -- self.SevenDayData:clear()
ModuleManager.TaskManager:clear() ModuleManager.TaskManager:clear()
@ -110,12 +112,13 @@ function DataManager:initWithServerData(data)
self.BagData:init(data.bag) self.BagData:init(data.bag)
self.FormationData:init(data.fight_info) self.FormationData:init(data.fight_info)
self.TutorialData:init(data.guide) self.TutorialData:init(data.guide)
self.MailData:init(data.mail_info)
self.ActivityData:init() self.ActivityData:init()
self.GodPigData:init() self.GodPigData:init()
self.BountyData:init(data.bounty) self.BountyData:init(data.bounty)
-- 任务要在BountyData之后初始化，依赖BountyData的数据 -- 任务要在BountyData之后初始化，依赖BountyData的数据
self.DailyTaskData:init(data.task_daily) self.DailyTaskData:init(data.task_daily)
-- self.IdleData:clear(data.IdleData) self.IdleData:init(data.idle)
-- self.SevenDayData:init(data.SevenDayData) -- self.SevenDayData:init(data.SevenDayData)
self:scheduleGlobal() self:scheduleGlobal()

9
lua/app/common/local_data.lua
View File

@ -26,6 +26,7 @@ local LOCAL_DATA_KEY = {
DISTINCT_ID = "DISTINCT_ID", DISTINCT_ID = "DISTINCT_ID",
LAST_LOGIN_TIME = "LAST_LOGIN_TIME", LAST_LOGIN_TIME = "LAST_LOGIN_TIME",
GATE = "GATE", GATE = "GATE",
BOUNTY_POP_TIME = "BOUNTY_POP_TIME",
} }
LocalData.KEYS = LOCAL_DATA_KEY LocalData.KEYS = LOCAL_DATA_KEY
@ -336,4 +337,12 @@ function LocalData:setLastLoginTime()
end end
function LocalData:setBountyPopTime(time)
self:setInt(LOCAL_DATA_KEY.BOUNTY_POP_TIME, time)
end
function LocalData:getBountyPopTime()
return self:getInt(LOCAL_DATA_KEY.BOUNTY_POP_TIME, 0)
end
return LocalData return LocalData

3
lua/app/common/module_manager.lua
View File

@ -37,6 +37,8 @@ local MODULE_PATHS = {
BountyManager = "app/module/bounty/bounty_manager", BountyManager = "app/module/bounty/bounty_manager",
-- 商店 -- 商店
ShopManager = "app/module/shop/shop_manager", ShopManager = "app/module/shop/shop_manager",
-- 邮件
MailManager = "app/module/mail/mail_manager",
} }
-- 这里的key对应func_open里的id -- 这里的key对应func_open里的id
@ -46,6 +48,7 @@ ModuleManager.MODULE_KEY = {
STORE_BOX_OPEN = "store_box_open", STORE_BOX_OPEN = "store_box_open",
STORE_BOX_3_OPEN = "store_box_3_open", STORE_BOX_3_OPEN = "store_box_3_open",
BOUNTY_OPEN = "bounty_open", BOUNTY_OPEN = "bounty_open",
IDLE_DROP = "idle_drop",
} }
local _moduleMgrs = {} local _moduleMgrs = {}

376
lua/app/config/bounty_level.lua
View File

@ -7,8 +7,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -27,8 +27,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -67,8 +67,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -87,8 +87,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -127,8 +127,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -147,8 +147,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -185,18 +185,18 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=8,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Xg==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44001, ["id"]=9,
["id_for_nothing"]="UgxcA2Q=", ["id_for_nothing"]="Xw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
["reward_type"]=1 ["reward_type"]=1
}, },
@ -208,8 +208,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -228,8 +228,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -268,8 +268,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -288,8 +288,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -328,8 +328,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -348,8 +348,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -386,18 +386,18 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=8,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Xg==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44001, ["id"]=9,
["id_for_nothing"]="UgxcA2Q=", ["id_for_nothing"]="Xw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
["reward_type"]=1 ["reward_type"]=1
}, },
@ -409,8 +409,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -429,8 +429,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -469,8 +469,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -489,8 +489,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -529,8 +529,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -549,8 +549,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -587,18 +587,18 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=8,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Xg==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44001, ["id"]=9,
["id_for_nothing"]="UgxcA2Q=", ["id_for_nothing"]="Xw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
["reward_type"]=1 ["reward_type"]=1
}, },
@ -610,8 +610,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -630,8 +630,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -670,8 +670,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -690,8 +690,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -730,8 +730,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -750,8 +750,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -788,18 +788,18 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=11,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vwk=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44001, ["id"]=18,
["id_for_nothing"]="UgxcA2Q=", ["id_for_nothing"]="VwA=",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
["reward_type"]=1 ["reward_type"]=1
}, },
@ -811,8 +811,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -831,8 +831,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -871,8 +871,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -891,8 +891,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -931,8 +931,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -951,8 +951,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -989,18 +989,18 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=8,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Xg==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44001, ["id"]=9,
["id_for_nothing"]="UgxcA2Q=", ["id_for_nothing"]="Xw==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
["reward_type"]=1 ["reward_type"]=1
}, },
@ -1012,8 +1012,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1032,8 +1032,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1072,8 +1072,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1092,8 +1092,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1132,8 +1132,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1152,8 +1152,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1190,18 +1190,18 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=11,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vwk=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44001, ["id"]=18,
["id_for_nothing"]="UgxcA2Q=", ["id_for_nothing"]="VwA=",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
["reward_type"]=1 ["reward_type"]=1
}, },
@ -1213,8 +1213,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1233,8 +1233,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1273,8 +1273,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1293,8 +1293,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1333,8 +1333,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1353,8 +1353,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1391,18 +1391,18 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=11,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vwk=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44001, ["id"]=12,
["id_for_nothing"]="UgxcA2Q=", ["id_for_nothing"]="Vwo=",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
["reward_type"]=1 ["reward_type"]=1
}, },
@ -1414,8 +1414,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1434,8 +1434,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1474,8 +1474,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1494,8 +1494,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1534,8 +1534,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1554,8 +1554,8 @@ local bounty_level = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=1, ["id"]=1,
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=100,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vwhc"
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
@ -1592,18 +1592,18 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=10,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vwg=",
["num"]=10, ["num"]=1,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vw=="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=44001, ["id"]=6,
["id_for_nothing"]="UgxcA2Q=", ["id_for_nothing"]="UA==",
["num"]=3, ["num"]=10,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="Vwg="
}, },
["reward_type"]=1 ["reward_type"]=1
}, },
@ -1613,8 +1613,8 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=10,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vwg=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -1633,10 +1633,10 @@ local bounty_level = {
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=44001,
["id_for_nothing"]="VA==", ["id_for_nothing"]="UgxcA2Q=",
["num"]=1, ["num"]=3,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VQ=="
} }
}, },
[202]={ [202]={
@ -1805,16 +1805,16 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=8,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Xg==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=9,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Xw==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -2006,16 +2006,16 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=8,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Xg==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=9,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Xw==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -2207,16 +2207,16 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=8,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Xg==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=9,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Xw==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -2408,16 +2408,16 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=11,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vwk=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=18,
["id_for_nothing"]="UA==", ["id_for_nothing"]="VwA=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -2609,16 +2609,16 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=8,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Xg==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=9,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Xw==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -2810,16 +2810,16 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=11,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vwk=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=18,
["id_for_nothing"]="UA==", ["id_for_nothing"]="VwA=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -3011,16 +3011,16 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=11,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vwk=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=12,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vwo=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -3212,16 +3212,16 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=10,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vwg=",
["num"]=10, ["num"]=1,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vw=="
}, },
["reward_pro"]={ ["reward_pro"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=44001,
["id_for_nothing"]="UA==", ["id_for_nothing"]="UgxcA2Q=",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
}, },
@ -3233,8 +3233,8 @@ local bounty_level = {
["reward"]={ ["reward"]={
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=10,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vwg=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }

46
lua/app/config/buff.lua
View File

@ -236,7 +236,6 @@ local buff = {
[33]={ [33]={
["name"]="stun", ["name"]="stun",
["buff_type"]=8, ["buff_type"]=8,
["stack"]=2,
["decr"]=2, ["decr"]=2,
["icon"]="stun", ["icon"]="stun",
["control_priority"]=2, ["control_priority"]=2,
@ -265,7 +264,6 @@ local buff = {
[36]={ [36]={
["name"]="normal_attack_dec", ["name"]="normal_attack_dec",
["buff_type"]=1, ["buff_type"]=1,
["stack"]=2,
["decr"]=2, ["decr"]=2,
["icon"]="normal_attack_dec", ["icon"]="normal_attack_dec",
["fx_continued"]={ ["fx_continued"]={
@ -416,6 +414,7 @@ local buff = {
[60]={ [60]={
["name"]="skill_hurt_add", ["name"]="skill_hurt_add",
["buff_type"]=1, ["buff_type"]=1,
["stack"]=2,
["decr"]=1 ["decr"]=1
}, },
[61]={ [61]={
@ -489,6 +488,42 @@ local buff = {
["name"]="death_summon", ["name"]="death_summon",
["buff_type"]=1, ["buff_type"]=1,
["decr"]=3 ["decr"]=3
},
[73]={
["name"]="shield_rebound_400",
["buff_type"]=2,
["decr"]=3,
["icon"]="shield",
["fx_continued"]={
11
},
["fx_disappear"]={
14
}
},
[74]={
["name"]="shield_ice",
["buff_type"]=2,
["decr"]=3,
["icon"]="shield_ice",
["fx_continued"]={
11
},
["fx_disappear"]={
14
}
},
[75]={
["name"]="shield_ice_rebound_400",
["buff_type"]=2,
["decr"]=3,
["icon"]="shield_ice",
["fx_continued"]={
11
},
["fx_disappear"]={
14
}
} }
} }
local keys = { local keys = {
@ -564,12 +599,15 @@ local keys = {
["dmg_dec_all_add"]=buff[69], ["dmg_dec_all_add"]=buff[69],
["be_sucked"]=buff[70], ["be_sucked"]=buff[70],
["be_dmg_to_heal"]=buff[71], ["be_dmg_to_heal"]=buff[71],
["death_summon"]=buff[72] ["death_summon"]=buff[72],
["shield_rebound_400"]=buff[73],
["shield_ice"]=buff[74],
["shield_ice_rebound_400"]=buff[75]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=72 count=75
} }
return config return config

639
lua/app/config/chapter.lua
View File

@ -14,9 +14,9 @@ local chapter = {
}, },
["involved_skill"]={ ["involved_skill"]={
{ {
3200101, 3200100,
2200101, 2200100,
4200101 4200100
} }
}, },
["not_involved_skill"]={ ["not_involved_skill"]={
@ -40,24 +40,6 @@ local chapter = {
401, 401,
501 501
}, },
["mystery_box"]={
{
1,
5
}
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -106,41 +88,17 @@ local chapter = {
["idle_exp"]=11, ["idle_exp"]=11,
["idle_gold"]=16, ["idle_gold"]=16,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -179,26 +137,9 @@ local chapter = {
1501 1501
}, },
["mystery_box"]={ ["mystery_box"]={
{ 1
1,
5
},
{
6,
10
}
}, },
["mystery_box_reward"]={ ["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{ {
{ {
["type"]=1, ["type"]=1,
@ -301,41 +242,17 @@ local chapter = {
["idle_exp"]=12, ["idle_exp"]=12,
["idle_gold"]=17, ["idle_gold"]=17,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -369,22 +286,16 @@ local chapter = {
3001 3001
}, },
["mystery_box"]={ ["mystery_box"]={
{
1, 1,
5 3
},
{
6,
10
}
}, },
["mystery_box_reward"]={ ["mystery_box_reward"]={
{ {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=2, ["id"]=4,
["id_for_nothing"]="VA==", ["id_for_nothing"]="Ug==",
["num"]=10, ["num"]=10,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
} }
@ -507,41 +418,17 @@ local chapter = {
["idle_exp"]=13, ["idle_exp"]=13,
["idle_gold"]=18, ["idle_gold"]=18,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -580,38 +467,6 @@ local chapter = {
4901, 4901,
5001 5001
}, },
["mystery_box"]={
{
1,
5
},
{
6,
10
}
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -746,41 +601,17 @@ local chapter = {
["idle_exp"]=14, ["idle_exp"]=14,
["idle_gold"]=19, ["idle_gold"]=19,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -819,38 +650,6 @@ local chapter = {
6901, 6901,
7001 7001
}, },
["mystery_box"]={
{
1,
5
},
{
6,
10
}
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -985,41 +784,17 @@ local chapter = {
["idle_exp"]=15, ["idle_exp"]=15,
["idle_gold"]=20, ["idle_gold"]=20,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -1058,38 +833,6 @@ local chapter = {
8901, 8901,
9001 9001
}, },
["mystery_box"]={
{
1,
5
},
{
6,
10
}
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -1224,41 +967,17 @@ local chapter = {
["idle_exp"]=16, ["idle_exp"]=16,
["idle_gold"]=21, ["idle_gold"]=21,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -1297,38 +1016,6 @@ local chapter = {
10901, 10901,
11001 11001
}, },
["mystery_box"]={
{
1,
5
},
{
6,
10
}
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -1479,41 +1166,17 @@ local chapter = {
["idle_exp"]=17, ["idle_exp"]=17,
["idle_gold"]=22, ["idle_gold"]=22,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -1552,38 +1215,6 @@ local chapter = {
12901, 12901,
13001 13001
}, },
["mystery_box"]={
{
1,
5
},
{
6,
10
}
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -1734,41 +1365,17 @@ local chapter = {
["idle_exp"]=18, ["idle_exp"]=18,
["idle_gold"]=23, ["idle_gold"]=23,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -1807,38 +1414,6 @@ local chapter = {
14901, 14901,
15001 15001
}, },
["mystery_box"]={
{
1,
5
},
{
6,
10
}
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -1989,41 +1564,17 @@ local chapter = {
["idle_exp"]=19, ["idle_exp"]=19,
["idle_gold"]=24, ["idle_gold"]=24,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -2061,38 +1612,6 @@ local chapter = {
16901, 16901,
17001 17001
}, },
["mystery_box"]={
{
1,
5
},
{
6,
10
}
},
["mystery_box_reward"]={
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
},
{
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
["wave_reward"]={ ["wave_reward"]={
{ {
["type"]=1, ["type"]=1,
@ -2243,41 +1762,17 @@ local chapter = {
["idle_exp"]=20, ["idle_exp"]=20,
["idle_gold"]=25, ["idle_gold"]=25,
["idle_drop"]={ ["idle_drop"]={
{
["type"]=1,
["id"]=4,
["num"]=3,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=5, ["id"]=5,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=6,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=7,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=8,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=9,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=10,
["num"]=1,
["weight"]=100
} }
} }
} }

1632
lua/app/config/chapter_board.lua
View File

File diff suppressed because it is too large Load Diff

5
lua/app/config/const.lua
View File

@ -98,6 +98,9 @@ local const = {
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vwg="
} }
}, },
["bounty_senior_rise"]={
["value"]=10
},
["idle_maxtime"]={ ["idle_maxtime"]={
["value"]=57600 ["value"]=57600
}, },
@ -166,6 +169,6 @@ local const = {
} }
} }
local config = { local config = {
data=const,count=34 data=const,count=35
} }
return config return config

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

@ -4,10 +4,10 @@ local func_open = {
["pop_ups"]=1 ["pop_ups"]=1
}, },
["bounty_open"]={ ["bounty_open"]={
["stage"]=2 ["stage"]=3
}, },
["task"]={ ["task"]={
["stage"]=2 ["stage"]=3
}, },
["act_level_gift"]={ ["act_level_gift"]={
["level"]=5 ["level"]=5

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

@ -169,6 +169,7 @@ local grid_type = {
3 3
}, },
["break_count"]=1, ["break_count"]=1,
["break_fly_to_character"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=3, ["effect"]=3,
@ -182,6 +183,7 @@ local grid_type = {
3 3
}, },
["break_count"]=3, ["break_count"]=3,
["break_fly_to_character"]=1,
["cant_link"]=1, ["cant_link"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=4, ["effect"]=4,

638
lua/app/config/hero.lua
View File

@ -9,10 +9,14 @@ local hero = {
1200113 1200113
}, },
["base_skill"]=1200120, ["base_skill"]=1200120,
["rouge_skill"]=1200101, ["rouge_skill"]=1200100,
["rouge_skill_1"]=1200102, ["rouge_skill_1"]=1200101,
["rouge_skill_2"]=1200103, ["rouge_skill_2"]=1200102,
["rouge_skill_3"]=1200104, ["rouge_skill_3"]=1200103,
["rouge_skill_4"]=1200104,
["rouge_skill_5"]=1200105,
["rouge_skill_6"]=1200106,
["rouge_skill_7"]=1200107,
["begin_lv"]=1, ["begin_lv"]=1,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -63,10 +67,14 @@ local hero = {
1300113 1300113
}, },
["base_skill"]=1300120, ["base_skill"]=1300120,
["rouge_skill"]=1200101, ["rouge_skill"]=1300100,
["rouge_skill_1"]=1200102, ["rouge_skill_1"]=1300101,
["rouge_skill_2"]=1200103, ["rouge_skill_2"]=1300102,
["rouge_skill_3"]=1200104, ["rouge_skill_3"]=1300103,
["rouge_skill_4"]=1300104,
["rouge_skill_5"]=1300105,
["rouge_skill_6"]=1300106,
["rouge_skill_7"]=1300107,
["begin_lv"]=3, ["begin_lv"]=3,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -105,7 +113,7 @@ local hero = {
["model_id"]="p0014", ["model_id"]="p0014",
["icon"]="5", ["icon"]="5",
["item_id"]=13001, ["item_id"]=13001,
["unlock_chapter"]=1 ["unlock_chapter"]=3
}, },
[13002]={ [13002]={
["position"]=1, ["position"]=1,
@ -117,10 +125,14 @@ local hero = {
1300213 1300213
}, },
["base_skill"]=1300220, ["base_skill"]=1300220,
["rouge_skill"]=1200101, ["rouge_skill"]=1300200,
["rouge_skill_1"]=1200102, ["rouge_skill_1"]=1300201,
["rouge_skill_2"]=1200103, ["rouge_skill_2"]=1300202,
["rouge_skill_3"]=1200104, ["rouge_skill_3"]=1300203,
["rouge_skill_4"]=1300204,
["rouge_skill_5"]=1300205,
["rouge_skill_6"]=1300206,
["rouge_skill_7"]=1300207,
["begin_lv"]=3, ["begin_lv"]=3,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -159,22 +171,26 @@ local hero = {
["model_id"]="p0009", ["model_id"]="p0009",
["icon"]="5", ["icon"]="5",
["item_id"]=13002, ["item_id"]=13002,
["unlock_chapter"]=1 ["unlock_chapter"]=3
}, },
[24001]={ [14001]={
["position"]=1, ["position"]=1,
["qlt"]=4, ["qlt"]=4,
["hurt_skill"]={ ["hurt_skill"]={
2400110, 1400110,
2400111, 1400111,
2400112, 1400112,
2400113 1400113
}, },
["base_skill"]=2400120, ["base_skill"]=1400120,
["rouge_skill"]=1200101, ["rouge_skill"]=1400100,
["rouge_skill_1"]=1200102, ["rouge_skill_1"]=1400101,
["rouge_skill_2"]=1200103, ["rouge_skill_2"]=1400102,
["rouge_skill_3"]=1200104, ["rouge_skill_3"]=1400103,
["rouge_skill_4"]=1400104,
["rouge_skill_5"]=1400105,
["rouge_skill_6"]=1400106,
["rouge_skill_7"]=1400107,
["begin_lv"]=5, ["begin_lv"]=5,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -212,8 +228,8 @@ local hero = {
}, },
["model_id"]="p0011", ["model_id"]="p0011",
["icon"]="5", ["icon"]="5",
["item_id"]=24001, ["item_id"]=14001,
["unlock_chapter"]=1 ["unlock_chapter"]=3
}, },
[22001]={ [22001]={
["position"]=2, ["position"]=2,
@ -225,10 +241,14 @@ local hero = {
2200113 2200113
}, },
["base_skill"]=2200120, ["base_skill"]=2200120,
["rouge_skill"]=2200101, ["rouge_skill"]=2200100,
["rouge_skill_1"]=2200102, ["rouge_skill_1"]=2200101,
["rouge_skill_2"]=2200103, ["rouge_skill_2"]=2200102,
["rouge_skill_3"]=2200104, ["rouge_skill_3"]=2200103,
["rouge_skill_4"]=2200104,
["rouge_skill_5"]=2200105,
["rouge_skill_6"]=2200106,
["rouge_skill_7"]=2200107,
["begin_lv"]=1, ["begin_lv"]=1,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -279,10 +299,14 @@ local hero = {
2300113 2300113
}, },
["base_skill"]=2300120, ["base_skill"]=2300120,
["rouge_skill"]=2200101, ["rouge_skill"]=2300100,
["rouge_skill_1"]=2200102, ["rouge_skill_1"]=2300101,
["rouge_skill_2"]=2200103, ["rouge_skill_2"]=2300102,
["rouge_skill_3"]=2200104, ["rouge_skill_3"]=2300103,
["rouge_skill_4"]=2300104,
["rouge_skill_5"]=2300105,
["rouge_skill_6"]=2300106,
["rouge_skill_7"]=2300107,
["begin_lv"]=3, ["begin_lv"]=3,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -321,7 +345,65 @@ local hero = {
["model_id"]="p0010", ["model_id"]="p0010",
["icon"]="5", ["icon"]="5",
["item_id"]=23001, ["item_id"]=23001,
["unlock_chapter"]=1 ["unlock_chapter"]=3
},
[23002]={
["position"]=2,
["qlt"]=3,
["hurt_skill"]={
2300210,
2300211,
2300212,
2300213
},
["base_skill"]=2300220,
["rouge_skill"]=2300200,
["rouge_skill_1"]=2300201,
["rouge_skill_2"]=2300202,
["rouge_skill_3"]=2300203,
["rouge_skill_4"]=2300204,
["rouge_skill_5"]=2300205,
["rouge_skill_6"]=2300206,
["rouge_skill_7"]=2300207,
["begin_lv"]=3,
["hp"]={
2000000,
2400000,
2800000,
3220000,
3660000,
4120000,
4620000,
5160000,
5760000,
6420000,
7140000,
7940000,
8840000,
9840000,
10980000
},
["atk"]={
1000000,
1200000,
1400000,
1610000,
1830000,
2060000,
2310000,
2580000,
2880000,
3210000,
3570000,
3970000,
4420000,
4920000,
5490000
},
["model_id"]="p0010",
["icon"]="5",
["item_id"]=23002,
["unlock_chapter"]=3
}, },
[24001]={ [24001]={
["position"]=2, ["position"]=2,
@ -333,10 +415,14 @@ local hero = {
2400113 2400113
}, },
["base_skill"]=2400120, ["base_skill"]=2400120,
["rouge_skill"]=2400101, ["rouge_skill"]=2400100,
["rouge_skill_1"]=2400102, ["rouge_skill_1"]=2400101,
["rouge_skill_2"]=2400103, ["rouge_skill_2"]=2400102,
["rouge_skill_3"]=2400104, ["rouge_skill_3"]=2400103,
["rouge_skill_4"]=2400104,
["rouge_skill_5"]=2400105,
["rouge_skill_6"]=2400106,
["rouge_skill_7"]=2400107,
["begin_lv"]=5, ["begin_lv"]=5,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -375,7 +461,7 @@ local hero = {
["model_id"]="p0007", ["model_id"]="p0007",
["icon"]="7", ["icon"]="7",
["item_id"]=24001, ["item_id"]=24001,
["unlock_chapter"]=1 ["unlock_chapter"]=3
}, },
[32001]={ [32001]={
["position"]=3, ["position"]=3,
@ -387,10 +473,14 @@ local hero = {
3200113 3200113
}, },
["base_skill"]=3200120, ["base_skill"]=3200120,
["rouge_skill"]=3200101, ["rouge_skill"]=3200100,
["rouge_skill_1"]=3200102, ["rouge_skill_1"]=3200101,
["rouge_skill_2"]=3200103, ["rouge_skill_2"]=3200102,
["rouge_skill_3"]=3200104, ["rouge_skill_3"]=3200103,
["rouge_skill_4"]=3200104,
["rouge_skill_5"]=3200105,
["rouge_skill_6"]=3200106,
["rouge_skill_7"]=3200107,
["begin_lv"]=1, ["begin_lv"]=1,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -441,10 +531,14 @@ local hero = {
3300113 3300113
}, },
["base_skill"]=3300120, ["base_skill"]=3300120,
["rouge_skill"]=3300101, ["rouge_skill"]=3300100,
["rouge_skill_1"]=3300102, ["rouge_skill_1"]=3300101,
["rouge_skill_2"]=3300103, ["rouge_skill_2"]=3300102,
["rouge_skill_3"]=3300104, ["rouge_skill_3"]=3300103,
["rouge_skill_4"]=3300104,
["rouge_skill_5"]=3300105,
["rouge_skill_6"]=3300106,
["rouge_skill_7"]=3300107,
["begin_lv"]=3, ["begin_lv"]=3,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -483,7 +577,123 @@ local hero = {
["model_id"]="p0006", ["model_id"]="p0006",
["icon"]="6", ["icon"]="6",
["item_id"]=33001, ["item_id"]=33001,
["unlock_chapter"]=1 ["unlock_chapter"]=3
},
[33002]={
["position"]=3,
["qlt"]=3,
["hurt_skill"]={
3300210,
3300211,
3300212,
3300213
},
["base_skill"]=3300220,
["rouge_skill"]=3300200,
["rouge_skill_1"]=3300201,
["rouge_skill_2"]=3300202,
["rouge_skill_3"]=3300203,
["rouge_skill_4"]=3300204,
["rouge_skill_5"]=3300205,
["rouge_skill_6"]=3300206,
["rouge_skill_7"]=3300207,
["begin_lv"]=3,
["hp"]={
2000000,
2400000,
2800000,
3220000,
3660000,
4120000,
4620000,
5160000,
5760000,
6420000,
7140000,
7940000,
8840000,
9840000,
10980000
},
["atk"]={
1000000,
1200000,
1400000,
1610000,
1830000,
2060000,
2310000,
2580000,
2880000,
3210000,
3570000,
3970000,
4420000,
4920000,
5490000
},
["model_id"]="p0006",
["icon"]="6",
["item_id"]=33002,
["unlock_chapter"]=3
},
[34001]={
["position"]=3,
["qlt"]=4,
["hurt_skill"]={
3400110,
3400111,
3400112,
3400113
},
["base_skill"]=3400120,
["rouge_skill"]=3400100,
["rouge_skill_1"]=3400101,
["rouge_skill_2"]=3400102,
["rouge_skill_3"]=3400103,
["rouge_skill_4"]=3400104,
["rouge_skill_5"]=3400105,
["rouge_skill_6"]=3400106,
["rouge_skill_7"]=3400107,
["begin_lv"]=5,
["hp"]={
2000000,
2400000,
2800000,
3220000,
3660000,
4120000,
4620000,
5160000,
5760000,
6420000,
7140000,
7940000,
8840000,
9840000,
10980000
},
["atk"]={
1000000,
1200000,
1400000,
1610000,
1830000,
2060000,
2310000,
2580000,
2880000,
3210000,
3570000,
3970000,
4420000,
4920000,
5490000
},
["model_id"]="p0006",
["icon"]="6",
["item_id"]=34001,
["unlock_chapter"]=3
}, },
[42001]={ [42001]={
["position"]=4, ["position"]=4,
@ -495,10 +705,14 @@ local hero = {
4200113 4200113
}, },
["base_skill"]=4200120, ["base_skill"]=4200120,
["rouge_skill"]=4200101, ["rouge_skill"]=4200100,
["rouge_skill_1"]=4200102, ["rouge_skill_1"]=4200101,
["rouge_skill_2"]=4200103, ["rouge_skill_2"]=4200102,
["rouge_skill_3"]=4200104, ["rouge_skill_3"]=4200103,
["rouge_skill_4"]=4200104,
["rouge_skill_5"]=4200105,
["rouge_skill_6"]=4200106,
["rouge_skill_7"]=4200107,
["begin_lv"]=1, ["begin_lv"]=1,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -539,6 +753,122 @@ local hero = {
["item_id"]=42001, ["item_id"]=42001,
["unlock_chapter"]=1 ["unlock_chapter"]=1
}, },
[43001]={
["position"]=4,
["qlt"]=3,
["hurt_skill"]={
4300110,
4300111,
4300112,
4300113
},
["base_skill"]=4300120,
["rouge_skill"]=4300100,
["rouge_skill_1"]=4300101,
["rouge_skill_2"]=4300102,
["rouge_skill_3"]=4300103,
["rouge_skill_4"]=4300104,
["rouge_skill_5"]=4300105,
["rouge_skill_6"]=4300106,
["rouge_skill_7"]=4300107,
["begin_lv"]=3,
["hp"]={
2000000,
2400000,
2800000,
3220000,
3660000,
4120000,
4620000,
5160000,
5760000,
6420000,
7140000,
7940000,
8840000,
9840000,
10980000
},
["atk"]={
1000000,
1200000,
1400000,
1610000,
1830000,
2060000,
2310000,
2580000,
2880000,
3210000,
3570000,
3970000,
4420000,
4920000,
5490000
},
["model_id"]="p0003",
["icon"]="3",
["item_id"]=43001,
["unlock_chapter"]=3
},
[43002]={
["position"]=4,
["qlt"]=3,
["hurt_skill"]={
4300210,
4300211,
4300212,
4300213
},
["base_skill"]=4300220,
["rouge_skill"]=4300300,
["rouge_skill_1"]=4300301,
["rouge_skill_2"]=4300302,
["rouge_skill_3"]=4300303,
["rouge_skill_4"]=4300304,
["rouge_skill_5"]=4300305,
["rouge_skill_6"]=4300306,
["rouge_skill_7"]=4300307,
["begin_lv"]=3,
["hp"]={
2000000,
2400000,
2800000,
3220000,
3660000,
4120000,
4620000,
5160000,
5760000,
6420000,
7140000,
7940000,
8840000,
9840000,
10980000
},
["atk"]={
1000000,
1200000,
1400000,
1610000,
1830000,
2060000,
2310000,
2580000,
2880000,
3210000,
3570000,
3970000,
4420000,
4920000,
5490000
},
["model_id"]="p0003",
["icon"]="3",
["item_id"]=43002,
["unlock_chapter"]=3
},
[44001]={ [44001]={
["position"]=4, ["position"]=4,
["qlt"]=4, ["qlt"]=4,
@ -549,10 +879,14 @@ local hero = {
4400113 4400113
}, },
["base_skill"]=4400120, ["base_skill"]=4400120,
["rouge_skill"]=4400101, ["rouge_skill"]=4400100,
["rouge_skill_1"]=4400102, ["rouge_skill_1"]=4400101,
["rouge_skill_2"]=4400103, ["rouge_skill_2"]=4400102,
["rouge_skill_3"]=4400104, ["rouge_skill_3"]=4400103,
["rouge_skill_4"]=4400104,
["rouge_skill_5"]=4400105,
["rouge_skill_6"]=4400106,
["rouge_skill_7"]=4400107,
["begin_lv"]=5, ["begin_lv"]=5,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -591,7 +925,7 @@ local hero = {
["model_id"]="p0008", ["model_id"]="p0008",
["icon"]="8", ["icon"]="8",
["item_id"]=44001, ["item_id"]=44001,
["unlock_chapter"]=1 ["unlock_chapter"]=3
}, },
[52001]={ [52001]={
["position"]=5, ["position"]=5,
@ -603,10 +937,14 @@ local hero = {
5200113 5200113
}, },
["base_skill"]=5200120, ["base_skill"]=5200120,
["rouge_skill"]=5200101, ["rouge_skill"]=5200100,
["rouge_skill_1"]=5200102, ["rouge_skill_1"]=5200101,
["rouge_skill_2"]=5200103, ["rouge_skill_2"]=5200102,
["rouge_skill_3"]=5200104, ["rouge_skill_3"]=5200103,
["rouge_skill_4"]=5200104,
["rouge_skill_5"]=5200105,
["rouge_skill_6"]=5200106,
["rouge_skill_7"]=5200107,
["begin_lv"]=1, ["begin_lv"]=1,
["hp"]={ ["hp"]={
2000000, 2000000,
@ -646,9 +984,183 @@ local hero = {
["icon"]="4", ["icon"]="4",
["item_id"]=52001, ["item_id"]=52001,
["unlock_chapter"]=1 ["unlock_chapter"]=1
},
[53001]={
["position"]=5,
["qlt"]=3,
["hurt_skill"]={
5300110,
5300111,
5300112,
5300113
},
["base_skill"]=5300120,
["rouge_skill"]=5300100,
["rouge_skill_1"]=5300101,
["rouge_skill_2"]=5300102,
["rouge_skill_3"]=5300103,
["rouge_skill_4"]=5300104,
["rouge_skill_5"]=5300105,
["rouge_skill_6"]=5300106,
["rouge_skill_7"]=5300107,
["begin_lv"]=3,
["hp"]={
2000000,
2400000,
2800000,
3220000,
3660000,
4120000,
4620000,
5160000,
5760000,
6420000,
7140000,
7940000,
8840000,
9840000,
10980000
},
["atk"]={
1000000,
1200000,
1400000,
1610000,
1830000,
2060000,
2310000,
2580000,
2880000,
3210000,
3570000,
3970000,
4420000,
4920000,
5490000
},
["model_id"]="p0004",
["icon"]="4",
["item_id"]=53001,
["unlock_chapter"]=3
},
[53002]={
["position"]=5,
["qlt"]=3,
["hurt_skill"]={
5300210,
5300211,
5300212,
5300213
},
["base_skill"]=5300220,
["rouge_skill"]=5300200,
["rouge_skill_1"]=5300201,
["rouge_skill_2"]=5300202,
["rouge_skill_3"]=5300203,
["rouge_skill_4"]=5300204,
["rouge_skill_5"]=5300205,
["rouge_skill_6"]=5300206,
["rouge_skill_7"]=5300207,
["begin_lv"]=3,
["hp"]={
2000000,
2400000,
2800000,
3220000,
3660000,
4120000,
4620000,
5160000,
5760000,
6420000,
7140000,
7940000,
8840000,
9840000,
10980000
},
["atk"]={
1000000,
1200000,
1400000,
1610000,
1830000,
2060000,
2310000,
2580000,
2880000,
3210000,
3570000,
3970000,
4420000,
4920000,
5490000
},
["model_id"]="p0004",
["icon"]="4",
["item_id"]=53002,
["unlock_chapter"]=3
},
[54001]={
["position"]=5,
["qlt"]=4,
["hurt_skill"]={
5400110,
5400111,
5400112,
5400113
},
["base_skill"]=5400120,
["rouge_skill"]=5400100,
["rouge_skill_1"]=5400101,
["rouge_skill_2"]=5400102,
["rouge_skill_3"]=5400103,
["rouge_skill_4"]=5400104,
["rouge_skill_5"]=5400105,
["rouge_skill_6"]=5400106,
["rouge_skill_7"]=5400107,
["begin_lv"]=5,
["hp"]={
2000000,
2400000,
2800000,
3220000,
3660000,
4120000,
4620000,
5160000,
5760000,
6420000,
7140000,
7940000,
8840000,
9840000,
10980000
},
["atk"]={
1000000,
1200000,
1400000,
1610000,
1830000,
2060000,
2310000,
2580000,
2880000,
3210000,
3570000,
3970000,
4420000,
4920000,
5490000
},
["model_id"]="p0004",
["icon"]="4",
["item_id"]=54001,
["unlock_chapter"]=3
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

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

@ -22,7 +22,7 @@ local hero_level = {
3, 3,
0 0
}, },
["unlock_skill"]=1 ["unlock_skill"]=2
}, },
[4]={ [4]={
["cost_2"]={ ["cost_2"]={
@ -48,7 +48,7 @@ local hero_level = {
3, 3,
0 0
}, },
["unlock_skill"]=2 ["unlock_skill"]=3
}, },
[6]={ [6]={
["cost_2"]={ ["cost_2"]={
@ -63,7 +63,7 @@ local hero_level = {
5, 5,
10000 10000
}, },
["unlock_skill"]=2 ["unlock_skill"]=3
}, },
[7]={ [7]={
["cost_2"]={ ["cost_2"]={
@ -78,7 +78,7 @@ local hero_level = {
10, 10,
20000 20000
}, },
["unlock_skill"]=2 ["unlock_skill"]=4
}, },
[8]={ [8]={
["cost_2"]={ ["cost_2"]={
@ -93,7 +93,7 @@ local hero_level = {
20, 20,
30000 30000
}, },
["unlock_skill"]=3 ["unlock_skill"]=4
}, },
[9]={ [9]={
["cost_2"]={ ["cost_2"]={
@ -108,7 +108,7 @@ local hero_level = {
25, 25,
40000 40000
}, },
["unlock_skill"]=3 ["unlock_skill"]=5
}, },
[10]={ [10]={
["cost_2"]={ ["cost_2"]={
@ -123,7 +123,7 @@ local hero_level = {
50, 50,
60000 60000
}, },
["unlock_skill"]=3 ["unlock_skill"]=5
}, },
[11]={ [11]={
["cost_2"]={ ["cost_2"]={
@ -138,7 +138,7 @@ local hero_level = {
100, 100,
80000 80000
}, },
["unlock_skill"]=3 ["unlock_skill"]=5
}, },
[12]={ [12]={
["cost_2"]={ ["cost_2"]={
@ -153,7 +153,7 @@ local hero_level = {
150, 150,
100000 100000
}, },
["unlock_skill"]=3 ["unlock_skill"]=6
}, },
[13]={ [13]={
["cost_2"]={ ["cost_2"]={
@ -168,7 +168,7 @@ local hero_level = {
200, 200,
150000 150000
}, },
["unlock_skill"]=3 ["unlock_skill"]=6
}, },
[14]={ [14]={
["cost_2"]={ ["cost_2"]={
@ -183,7 +183,7 @@ local hero_level = {
300, 300,
200000 200000
}, },
["unlock_skill"]=3 ["unlock_skill"]=6
}, },
[15]={ [15]={
["cost_2"]={ ["cost_2"]={
@ -198,7 +198,7 @@ local hero_level = {
400, 400,
300000 300000
}, },
["unlock_skill"]=3 ["unlock_skill"]=7
} }
} }
local config = { local config = {

260
lua/app/config/item.lua
View File

@ -74,11 +74,47 @@ local item = {
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
}, },
{
["type"]=1,
["id"]=23002,
["num"]=1,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=33001, ["id"]=33001,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=33002,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=43001,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=43002,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=53001,
["num"]=1,
["weight"]=100
},
{
["type"]=1,
["id"]=53002,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -89,7 +125,7 @@ local item = {
["hero_drop"]={ ["hero_drop"]={
{ {
["type"]=1, ["type"]=1,
["id"]=24001, ["id"]=14001,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
}, },
@ -99,11 +135,23 @@ local item = {
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
}, },
{
["type"]=1,
["id"]=34001,
["num"]=1,
["weight"]=100
},
{ {
["type"]=1, ["type"]=1,
["id"]=44001, ["id"]=44001,
["num"]=1, ["num"]=1,
["weight"]=100 ["weight"]=100
},
{
["type"]=1,
["id"]=54001,
["num"]=1,
["weight"]=100
} }
} }
}, },
@ -115,22 +163,94 @@ local item = {
[8]={ [8]={
["type"]=4, ["type"]=4,
["qlt"]=1, ["qlt"]=1,
["icon"]="8" ["icon"]="8",
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
}, },
[9]={ [9]={
["type"]=4, ["type"]=4,
["qlt"]=1, ["qlt"]=1,
["icon"]="9" ["icon"]="9",
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=7,
["num_for_nothing"]="UQ=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=27,
["num_for_nothing"]="VA8="
}
}
}, },
[10]={ [10]={
["type"]=4, ["type"]=4,
["qlt"]=1, ["qlt"]=1,
["icon"]="10" ["icon"]="10",
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=84,
["num_for_nothing"]="Xgw="
}
}
}, },
[11]={ [11]={
["type"]=4, ["type"]=4,
["qlt"]=1, ["qlt"]=1,
["icon"]="11" ["icon"]="11",
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=7,
["num_for_nothing"]="UQ=="
}
}
}, },
[12]={ [12]={
["type"]=1, ["type"]=1,
@ -152,6 +272,80 @@ local item = {
["qlt"]=5, ["qlt"]=5,
["icon"]="15" ["icon"]="15"
}, },
[16]={
["type"]=4,
["qlt"]=1,
["icon"]="16",
["reward"]={
{
["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"]=5,
["id_for_nothing"]="Uw==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[17]={
["type"]=4,
["qlt"]=1,
["icon"]="17",
["reward"]={
{
["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"]=5,
["id_for_nothing"]="Uw==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[18]={
["type"]=4,
["qlt"]=1,
["icon"]="11",
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=18,
["num_for_nothing"]="VwA="
}
}
},
[19]={
["type"]=2,
["qlt"]=1,
["icon"]="19"
},
[12001]={ [12001]={
["type"]=5, ["type"]=5,
["parameter"]=12001, ["parameter"]=12001,
@ -170,11 +364,11 @@ local item = {
["qlt"]=3, ["qlt"]=3,
["icon"]="13002" ["icon"]="13002"
}, },
[24001]={ [14001]={
["type"]=5, ["type"]=5,
["parameter"]=24001, ["parameter"]=14001,
["qlt"]=4, ["qlt"]=4,
["icon"]="24001" ["icon"]="14001"
}, },
[22001]={ [22001]={
["type"]=5, ["type"]=5,
@ -188,6 +382,12 @@ local item = {
["qlt"]=3, ["qlt"]=3,
["icon"]="23001" ["icon"]="23001"
}, },
[23002]={
["type"]=5,
["parameter"]=23002,
["qlt"]=3,
["icon"]="23002"
},
[24001]={ [24001]={
["type"]=5, ["type"]=5,
["parameter"]=24001, ["parameter"]=24001,
@ -206,12 +406,36 @@ local item = {
["qlt"]=3, ["qlt"]=3,
["icon"]="33001" ["icon"]="33001"
}, },
[33002]={
["type"]=5,
["parameter"]=33002,
["qlt"]=3,
["icon"]="33002"
},
[34001]={
["type"]=5,
["parameter"]=34001,
["qlt"]=4,
["icon"]="34001"
},
[42001]={ [42001]={
["type"]=5, ["type"]=5,
["parameter"]=42001, ["parameter"]=42001,
["qlt"]=2, ["qlt"]=2,
["icon"]="42001" ["icon"]="42001"
}, },
[43001]={
["type"]=5,
["parameter"]=43001,
["qlt"]=3,
["icon"]="43001"
},
[43002]={
["type"]=5,
["parameter"]=43002,
["qlt"]=3,
["icon"]="43002"
},
[44001]={ [44001]={
["type"]=5, ["type"]=5,
["parameter"]=44001, ["parameter"]=44001,
@ -223,9 +447,27 @@ local item = {
["parameter"]=52001, ["parameter"]=52001,
["qlt"]=2, ["qlt"]=2,
["icon"]="52001" ["icon"]="52001"
},
[53001]={
["type"]=5,
["parameter"]=53001,
["qlt"]=3,
["icon"]="53001"
},
[53002]={
["type"]=5,
["parameter"]=53002,
["qlt"]=3,
["icon"]="53002"
},
[54001]={
["type"]=5,
["parameter"]=54001,
["qlt"]=4,
["icon"]="54001"
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=39
} }
return config return config

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

@ -75,6 +75,43 @@ local LocalizationGlobalConst =
ACT_SEVENDAY_DESC = "ACT_SEVENDAY_DESC", ACT_SEVENDAY_DESC = "ACT_SEVENDAY_DESC",
BTN_CLAIM = "BTN_CLAIM", BTN_CLAIM = "BTN_CLAIM",
BTN_DONE = "BTN_DONE", BTN_DONE = "BTN_DONE",
BOUNTY_BUY_LEVEL_TITLE = "BOUNTY_BUY_LEVEL_TITLE",
BOUNTY_BUY_LEVEL_COUNTENT = "BOUNTY_BUY_LEVEL_COUNTENT",
BOUNTY_PURCHASE_NAME = "BOUNTY_PURCHASE_NAME",
BOUNTY_DESC_1 = "BOUNTY_DESC_1",
BOUNTY_DESC_2 = "BOUNTY_DESC_2",
REWARD_BOX_DESC = "REWARD_BOX_DESC",
BOUNTY_DESC_3 = "BOUNTY_DESC_3",
STR_MAX = "STR_MAX",
ALREADY_ACTIVE = "ALREADY_ACTIVE",
ACTIVE_BOUNTY = "ACTIVE_BOUNTY",
BOUNTY_FREE_NAME = "BOUNTY_FREE_NAME",
CONFIRM_IGNORE = "CONFIRM_IGNORE",
MAIL_NAME = "MAIL_NAME",
COLLET_REWARDS = "COLLET_REWARDS",
TASK_NAME = "TASK_NAME",
TASK_DAILY = "TASK_DAILY",
TASK_CHALLENGE = "TASK_CHALLENGE",
TASK_HELP_1 = "TASK_HELP_1",
STR_REFRESH = "STR_REFRESH",
STR_UNLOCK = "STR_UNLOCK",
TASK_DESC_1 = "TASK_DESC_1",
STR_COMPLETED = "STR_COMPLETED",
HERO_CARD_TIPS_DESC = "HERO_CARD_TIPS_DESC",
HERO_CARD_DESC_QLT_2 = "HERO_CARD_DESC_QLT_2",
HERO_CARD_DESC_QLT_3 = "HERO_CARD_DESC_QLT_3",
HERO_CARD_DESC_QLT_4 = "HERO_CARD_DESC_QLT_4",
HERO_CARD_DESC_QLT_5 = "HERO_CARD_DESC_QLT_5",
HERO_CARD_DESC_QLT_6 = "HERO_CARD_DESC_QLT_6",
IDLE_DROP_REWARD = "IDLE_DROP_REWARD",
IDLE_DROP_DESC_1 = "IDLE_DROP_DESC_1",
PER_HOUR = "PER_HOUR",
IDLE_DROP_DESC_2 = "IDLE_DROP_DESC_2",
IDLE_QUICK = "IDLE_QUICK",
IDLE_DROP_DESC_3 = "IDLE_DROP_DESC_3",
STR_FREE = "STR_FREE",
TODAY_REMAIN_TIMES = "TODAY_REMAIN_TIMES",
BUY_ENERGY = "BUY_ENERGY",
} }
return LocalizationGlobalConst return LocalizationGlobalConst

109
lua/app/config/mail.lua Normal file
View File

@ -0,0 +1,109 @@
local mail = {
[1]={
["type"]=1,
["time_type"]=1,
["time_send"]={
0,
0,
0
},
["time"]=24,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
[2]={
["type"]=2,
["time_type"]=1,
["time_send"]={
0,
0,
0
},
["time"]=24,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
[3]={
["type"]=3,
["time_type"]=2,
["time_send"]={
5,
12,
0,
0
},
["time"]=24,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
}
}
},
[4]={
["type"]=3,
["time_type"]=2,
["time_send"]={
6,
12,
0,
0
},
["time"]=24,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
}
}
},
[5]={
["type"]=3,
["time_type"]=2,
["time_send"]={
7,
12,
0,
0
},
["time"]=24,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=70,
["num_for_nothing"]="UQg="
}
}
}
}
local config = {
data=mail,count=5
}
return config

10
lua/app/config/mail.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 11665dfdb08a75846bfb0d3a63277542
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

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

@ -76,7 +76,7 @@ local recharge = {
["price"]=9.99, ["price"]=9.99,
["price_cn"]=68, ["price_cn"]=68,
["same_price"]=10, ["same_price"]=10,
["price_str"]="9.99", ["price_str"]="$9.99",
["score"]=10 ["score"]=10
}, },
[11]={ [11]={
@ -84,7 +84,7 @@ local recharge = {
["price"]=11.99, ["price"]=11.99,
["price_cn"]=78, ["price_cn"]=78,
["same_price"]=12, ["same_price"]=12,
["price_str"]="11.99", ["price_str"]="$11.99",
["score"]=12 ["score"]=12
}, },
[12]={ [12]={
@ -148,7 +148,7 @@ local recharge = {
["price"]=199.99, ["price"]=199.99,
["price_cn"]=1298, ["price_cn"]=1298,
["same_price"]=200, ["same_price"]=200,
["price_str"]="199.99", ["price_str"]="$199.99",
["score"]=200 ["score"]=200
} }
} }

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -75,6 +75,43 @@ local localization_global =
["ACT_SEVENDAY_DESC"] = "每日将开启新的任务。", ["ACT_SEVENDAY_DESC"] = "每日将开启新的任务。",
["BTN_CLAIM"] = "领取", ["BTN_CLAIM"] = "领取",
["BTN_DONE"] = "已领取", ["BTN_DONE"] = "已领取",
["BOUNTY_BUY_LEVEL_TITLE"] = "确认解锁等级",
["BOUNTY_BUY_LEVEL_COUNTENT"] = "立即解锁当前等级\n等级奖励将立即解锁，你收集到的积分数量仍然相同",
["BOUNTY_PURCHASE_NAME"] = "黄金通行证",
["BOUNTY_DESC_1"] = "解锁奖励和奖励任务",
["BOUNTY_DESC_2"] = "获得高级通行证，+10级，立即获得更多奖励！",
["REWARD_BOX_DESC"] = "奖励宝箱",
["BOUNTY_DESC_3"] = "当你完成通行证的所有内容,每1000个积分可以获取一个奖励宝箱",
["STR_MAX"] = "MAX",
["ALREADY_ACTIVE"] = "已激活",
["ACTIVE_BOUNTY"] = "激活黄金通行证",
["BOUNTY_FREE_NAME"] = "免费通行证",
["CONFIRM_IGNORE"] = "今日不再提示",
["MAIL_NAME"] = "邮箱",
["COLLET_REWARDS"] = "收集奖励",
["TASK_NAME"] = "任务",
["TASK_DAILY"] = "日常",
["TASK_CHALLENGE"] = "挑战",
["TASK_HELP_1"] = "每日刷新，刷新后任务将重置，可以观看广告刷新任务",
["STR_REFRESH"] = "刷新",
["STR_UNLOCK"] = "解锁",
["TASK_DESC_1"] = "通行证专属任务",
["STR_COMPLETED"] = "已完成",
["HERO_CARD_TIPS_DESC"] = "可能获得以下英雄卡牌：",
["HERO_CARD_DESC_QLT_2"] = "优秀英雄",
["HERO_CARD_DESC_QLT_3"] = "稀有英雄",
["HERO_CARD_DESC_QLT_4"] = "史诗英雄",
["HERO_CARD_DESC_QLT_5"] = "传说英雄",
["HERO_CARD_DESC_QLT_6"] = "神话英雄",
["IDLE_DROP_REWARD"] = "挂机奖励",
["IDLE_DROP_DESC_1"] = "章节越高，收益越大",
["PER_HOUR"] = "{0}/小时",
["IDLE_DROP_DESC_2"] = "最长挂机{0}小时",
["IDLE_QUICK"] = "快速挂机",
["IDLE_DROP_DESC_3"] = "立刻获得{0}小时挂机奖励",
["STR_FREE"] = "免费",
["TODAY_REMAIN_TIMES"] = "今日剩余{0}次",
["BUY_ENERGY"] = "购买体力",
} }
return localization_global return localization_global

44
lua/app/config/strings/cn/hero.lua
View File

@ -3,40 +3,64 @@ local hero = {
["name"]="舞娘" ["name"]="舞娘"
}, },
[13001]={ [13001]={
["name"]="独臂哥" ["name"]="克劳德"
}, },
[13002]={ [13002]={
["name"]="火旺" ["name"]="火旺"
}, },
[24001]={ [14001]={
["name"]="铁锤赵" ["name"]="亚历山大"
}, },
[22001]={ [22001]={
["name"]="黑刀妹" ["name"]="刀妹"
}, },
[23001]={ [23001]={
["name"]="野蛮人" ["name"]="野蛮人"
}, },
[23002]={
["name"]="二丫"
},
[24001]={ [24001]={
["name"]="魔童剑士" ["name"]="巨剑魔童"
}, },
[32001]={ [32001]={
["name"]="洋葱骑士" ["name"]="洋葱头"
}, },
[33001]={ [33001]={
["name"]="小鹿" ["name"]="小鹿"
}, },
[33002]={
["name"]="森林狼"
},
[34001]={
["name"]="木兰"
},
[42001]={ [42001]={
["name"]="法师" ["name"]="蓝法"
},
[43001]={
["name"]="冰女"
},
[43002]={
["name"]="鸦姐"
}, },
[44001]={ [44001]={
["name"]="蓝SSR冰刃" ["name"]="寒冰妖姬"
}, },
[52001]={ [52001]={
["name"]="忍者" ["name"]="忍者伦"
},
[53001]={
["name"]="魔女琪琪"
},
[53002]={
["name"]="灵魂猎手"
},
[54001]={
["name"]="蝴蝶"
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

88
lua/app/config/strings/cn/item.lua
View File

@ -28,16 +28,20 @@ local item = {
["desc"]="累计积分可提升通行证等级。" ["desc"]="累计积分可提升通行证等级。"
}, },
[8]={ [8]={
["name"]="木箱（优秀，稀有）" ["name"]="木箱（优秀，稀有）",
["desc"]="木箱（优秀，稀有）"
}, },
[9]={ [9]={
["name"]="木箱2（优秀，稀有）" ["name"]="木箱2（优秀，稀有）",
["desc"]="木箱2（优秀，稀有）"
}, },
[10]={ [10]={
["name"]="金箱（优秀，稀有）" ["name"]="金箱（优秀，稀有）",
["desc"]="金箱（优秀，稀有）"
}, },
[11]={ [11]={
["name"]="铂金箱（稀有，史诗）" ["name"]="铂金箱（稀有，史诗）",
["desc"]="铂金箱（稀有，史诗）"
}, },
[12]={ [12]={
["name"]="经验", ["name"]="经验",
@ -55,56 +59,100 @@ local item = {
["name"]="珍贵钥匙", ["name"]="珍贵钥匙",
["desc"]="用于商城开启珍贵宝箱。" ["desc"]="用于商城开启珍贵宝箱。"
}, },
[12001]={ [16]={
["name"]="红R舞女碎片", ["name"]="所有任务宝箱",
["desc"]="凑齐可解锁或升级。" ["desc"]="完成5个日常任务获得"
},
[17]={
["name"]="广告累计宝箱",
["desc"]="你可以在游戏种任何地点看广告，获得奖励"
},
[18]={
["name"]="铂金箱（稀有，史诗）",
["desc"]="铂金箱（稀有，史诗）"
},
[19]={
["name"]="随机碎片",
["desc"]="挂机可获得随机碎片，领取后数量和品质将根据关卡提升。"
}, },
[13001]={ [13001]={
["name"]="红SR-克劳德碎片", ["name"]="红SR-克劳德",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[13002]={ [13002]={
["name"]="红SR-武僧碎片", ["name"]="红SR-武僧",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[24001]={ [14001]={
["name"]="红SSR-铁锤小孩碎片", ["name"]="红SSR-铁锤小孩",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[22001]={ [22001]={
["name"]="黄R黑妹碎片", ["name"]="黄R黑妹",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[23001]={ [23001]={
["name"]="黄SR野蛮人碎片", ["name"]="黄SR野蛮人",
["desc"]="凑齐可解锁或升级。"
},
[23002]={
["name"]="黄SR二丫",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[24001]={ [24001]={
["name"]="黄ssr巨剑碎片", ["name"]="黄ssr巨剑",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[32001]={ [32001]={
["name"]="绿R洋葱碎片", ["name"]="绿R洋葱",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[33001]={ [33001]={
["name"]="绿SR小鹿碎片", ["name"]="绿SR小鹿",
["desc"]="凑齐可解锁或升级。"
},
[33002]={
["name"]="绿SR森林狼",
["desc"]="凑齐可解锁或升级。"
},
[34001]={
["name"]="绿SSR花木兰",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[42001]={ [42001]={
["name"]="蓝R莉莉丝碎片", ["name"]="蓝R莉莉丝",
["desc"]="凑齐可解锁或升级。"
},
[43001]={
["name"]="蓝SR冰女",
["desc"]="凑齐可解锁或升级。"
},
[43002]={
["name"]="蓝SR鸦姐",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[44001]={ [44001]={
["name"]="蓝SSR冰刃碎片", ["name"]="蓝SSR冰刃",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
}, },
[52001]={ [52001]={
["name"]="紫R忍者碎片", ["name"]="紫R忍者",
["desc"]="凑齐可解锁或升级。"
},
[53001]={
["name"]="紫SR女巫",
["desc"]="凑齐可解锁或升级。"
},
[53002]={
["name"]="紫SR德古拉",
["desc"]="凑齐可解锁或升级。"
},
[54001]={
["name"]="紫SSR蝴蝶",
["desc"]="凑齐可解锁或升级。" ["desc"]="凑齐可解锁或升级。"
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

24
lua/app/config/strings/cn/mail.lua Normal file
View File

@ -0,0 +1,24 @@
local mail = {
[1]={
["name"]="路边老爷爷的馈赠"
},
[2]={
["name"]="国王的日常补给"
},
[3]={
["name"]="哼哼哈嘿",
["desc"]="乐观的人总在不经意间获得意外之喜"
},
[4]={
["name"]="仁者无敌",
["desc"]="心地善良的人,会善有善报的"
},
[5]={
["name"]="风生水起",
["desc"]="精力充沛,运势良好,财运连连"
}
}
local config = {
data=mail,count=5
}
return config

10
lua/app/config/strings/cn/mail.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: bbf38508076c6a04d9f1bf15181bd3b6
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

68
lua/app/config/strings/cn/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
["desc"]="长枪突刺：造成1次大量伤害" ["desc"]="舞步消散：沿横向消除5格，并造成一次技能伤害。"
},
[1300120]={
["desc"]="巨剑旋风：额外造成多次技能伤害。"
},
[1300220]={
["desc"]="炎拳：沿纵向消除5格，并造成一次技能伤害，50%概率附加灼烧效果，2回合。"
},
[1400120]={
["desc"]="钢铁重击：将周围4个元素变色，并造成多次大量技能伤害。"
}, },
[2200120]={ [2200120]={
["desc"]="拔刀斩：造成1次大量伤害" ["desc"]="拔刀斩：额外造成一次技能伤害。"
}, },
[4200120]={ [2300120]={
["desc"]="元素链接：随机额外消除3个元素" ["desc"]="骨旋风：额外造成多次技能伤害。"
}, },
[5200120]={ [2300220]={
["desc"]="魔法罩：生成一个魔法罩持续1回合，可承受最大生命值10%伤害" ["desc"]="幻影剑袭：使用后本次技能伤害提升，并额外造成多次大量技能伤害。"
},
[1200120]={
["desc"]="舞步消散：将左右2格元素进行消除"
},
[3300120]={
["desc"]="快速治愈：立即恢复艾芙琳150%攻击力的生命值"
}, },
[2400120]={ [2400120]={
["desc"]="巨剑连斩：攻击伤害增加50%，结束时使用巨剑造成大量伤害。" ["desc"]="巨剑轰击：额外造成一次巨量技能伤害。"
},
[3200120]={
["desc"]="长枪突刺：额外造成一次技能伤害。"
},
[3300120]={
["desc"]="急速治疗：使用后本次恢复生命。"
},
[3300220]={
["desc"]="森林狼：使用后本次伤害提升，并造成多次技能伤害。"
},
[3400120]={
["desc"]="流星追月：使用后本次伤害提升，并一次巨量技能伤害。"
},
[4200120]={
["desc"]="元素链接：随机消除3个元素，并造成一次技能伤害。"
},
[4300120]={
["desc"]="冰女：额外造成一次技能伤害，附加冰霜效果，1回合。"
},
[4300220]={
["desc"]="鸦姐：额外造成一次技能伤害，附加腐败效果，1回合。"
}, },
[4400120]={ [4400120]={
["desc"]="霜冻剑舞：造成1次大量伤害并给敌人1回合冰霜效果（普攻次数-2）" ["desc"]="冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。"
},
[5200120]={
["desc"]="护盾术：为团队附加一个护盾，1回合。"
},
[5300120]={
["desc"]="魔女琪琪：额外造成一次大量技能伤害。"
},
[5300220]={
["desc"]="灵魂猎手：额外造成一次大量技能伤害。"
},
[5400120]={
["desc"]="蝴蝶：额外造成一次大量技能伤害。"
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

450
lua/app/config/strings/cn/skill_rogue.lua
View File

@ -131,104 +131,488 @@ local skill_rogue = {
[44]={ [44]={
["desc"]="将场上随机<color=#3cff28>5</color>个非紫色元素变为紫色" ["desc"]="将场上随机<color=#3cff28>5</color>个非紫色元素变为紫色"
}, },
[1200100]={
["desc"]="解锁舞步消散：沿横向消除5格，并造成一次技能伤害。"
},
[1200101]={ [1200101]={
["desc"]="舞步消散：将左右<color=#3cff28>2</color>格元素进行消除" ["desc"]="舞步消散纵向可额外消除2格。"
}, },
[1200102]={ [1200102]={
["desc"]="舞步消散上下可多消<color=#3cff28>1</color>格" ["desc"]="舞步消散使用时本次普攻伤害提升10%。"
}, },
[1200103]={ [1200103]={
["desc"]="舞步消散使用时本次普攻伤害提升<color=#3cff28>10%</color>" ["desc"]="舞步消散对冰霜敌人的伤害增加50%。"
}, },
[1200104]={ [1200104]={
["desc"]="每有1个元素连接舞步消散则本回合格挡增加<color=#3cff28>2%</color>" ["desc"]="舞步消散横向和纵向可额外消除2格。"
},
[1200105]={
["desc"]="舞步消散链接超过5个元素附加亢奋效果，2回合。"
},
[1200106]={
["desc"]="舞娘攻击提升15%。"
},
[1200107]={
["desc"]="舞步消散附加亢奋效果的要求降低到链接超过3个元素。"
},
[1300100]={
["desc"]="解锁巨剑旋风：额外造成多次技能伤害。"
},
[1300101]={
["desc"]="巨剑旋风可附加灼烧效果，2回合。"
},
[1300102]={
["desc"]="巨剑旋风对流血敌人的伤害增加50%。"
},
[1300103]={
["desc"]="巨剑旋风技能伤害提升。"
},
[1300104]={
["desc"]="巨剑旋风附加的灼烧伤效果，伤害提升。"
},
[1300105]={
["desc"]="巨剑旋风链接超过4个元素，伤害提升30%，2回合。"
},
[1300106]={
["desc"]="巨剑旋风附加的伤害提升效果，回合数+1。"
},
[1300107]={
["desc"]="巨剑旋风击杀敌人则附加亢奋效果，2回合。"
},
[1300200]={
["desc"]="解锁炎拳：沿纵向消除5格，并造成一次技能伤害，50%概率附加灼烧效果，2回合。"
},
[1300201]={
["desc"]="炎拳沿横向可额外消除4格。"
},
[1300202]={
["desc"]="炎拳对禁锢敌人的伤害增加50%。"
},
[1300203]={
["desc"]="炎拳的灼烧概率提高到100%。"
},
[1300204]={
["desc"]="炎拳纵向可额外消除2格。"
},
[1300205]={
["desc"]="炎拳附加的灼烧效果，伤害提升。"
},
[1300206]={
["desc"]="火旺攻击提升15%。"
},
[1300207]={
["desc"]="炎拳攻击将释放2次。"
},
[1400100]={
["desc"]="解锁钢铁重击：将周围4个元素变色，并造成多次大量技能伤害。"
},
[1400101]={
["desc"]="钢铁重击可附加灼烧效果，2回合。"
},
[1400102]={
["desc"]="钢铁重击对眩晕敌人再施附加眩晕效果，2回合。"
},
[1400103]={
["desc"]="钢铁重击对流血敌人额外造成1次伤害。"
},
[1400104]={
["desc"]="钢铁重击50%概率附加眩晕，2回合。"
},
[1400105]={
["desc"]="钢铁重击附加的灼烧效果，伤害提升，回合数+1。"
},
[1400106]={
["desc"]="亚历山大攻击提升15%。"
},
[1400107]={
["desc"]="钢铁重击每连接超过4个元素则额外发射1个火球造成伤害。"
},
[2200100]={
["desc"]="解锁拔刀斩：额外造成一次技能伤害。"
}, },
[2200101]={ [2200101]={
["desc"]="拔刀斩：卡拉可造成<color=#3cff28>1</color>次大量伤害" ["desc"]="拔刀斩技能伤害提升。"
}, },
[2200102]={ [2200102]={
["desc"]="拔刀斩<color=#3cff28>伤害提升</color>" ["desc"]="拔刀斩沿＋方向可额外消除4格。"
}, },
[2200103]={ [2200103]={
["desc"]="拔刀斩释放时上下左右各消除<color=#3cff28>1</color>格" ["desc"]="拔刀斩对灼烧敌人的伤害增加50%。"
}, },
[2200104]={ [2200104]={
["desc"]="拔刀斩终结技可放<color=#3cff28>2</color>次" ["desc"]="刀妹攻击提升15%。"
},
[2200105]={
["desc"]="拔刀斩攻击将释放2次。"
},
[2200106]={
["desc"]="拔刀斩沿X方向可额外消除4格。"
},
[2200107]={
["desc"]="拔刀斩链接超过5个元素，则技能伤害提高。"
},
[2300100]={
["desc"]="解锁骨旋风：额外造成多次技能伤害。"
},
[2300101]={
["desc"]="旋风骨可附加流血效果，2回合。"
},
[2300102]={
["desc"]="旋风骨技能伤害提升。"
},
[2300103]={
["desc"]="旋风骨对昏睡敌人有50%概率附加眩晕效果，1回合。"
},
[2300104]={
["desc"]="旋风骨附加的流血效果，回合数+1。"
},
[2300105]={
["desc"]="每有1名敌人因流血死亡，则野蛮人伤害提升10%。"
},
[2300106]={
["desc"]="旋风骨附加的眩晕效果，回合数+1。"
},
[2300107]={
["desc"]="野蛮人攻击提升15%。"
},
[2300200]={
["desc"]="解锁幻影剑袭：使用后本次技能伤害提升，并额外造成多次大量技能伤害。"
},
[2300201]={
["desc"]="幻影剑袭沿＋方向可额外消除4格。"
},
[2300202]={
["desc"]="二丫攻击提升15%。"
},
[2300203]={
["desc"]="幻影剑袭使用时本次普攻伤害提升10%。"
},
[2300204]={
["desc"]="幻影剑袭沿X方向可额外消除4格。"
},
[2300205]={
["desc"]="幻影剑袭链接超过4个元素，本回合暴击提升20%。"
},
[2300206]={
["desc"]="幻影剑袭链接超过4个元素，本回合暴击提升30%。"
},
[2300207]={
["desc"]="幻影剑袭使用时本回合对生命值50%以下的敌人暴击伤害提升50%。"
},
[2400100]={
["desc"]="解锁巨剑轰击：额外造成一次巨量技能伤害。"
}, },
[2400101]={ [2400101]={
["desc"]="巨剑连斩：每一次攻击的伤害将增加<color=#3cff28>50%</color>" ["desc"]="巨剑轰击沿X方向可额外消除4格。"
}, },
[2400102]={ [2400102]={
["desc"]="巨剑连斩被连接消除其上下左右<color=#3cff28>4</color>个元素" ["desc"]="巨剑轰击对冻结敌人伤害大服增加，并有50%概率附加眩晕效果，1回合。"
}, },
[2400103]={ [2400103]={
["desc"]="巨剑连斩使用时本次普攻伤害提升<color=#3cff28>20%</color>" ["desc"]="巨剑轰击附加眩晕效果的概率提高到70%。"
}, },
[2400104]={ [2400104]={
["desc"]="巨剑连斩被连接消除其斜方向的<color=#3cff28>4</color>个元素" ["desc"]="巨剑魔童攻击提升15%。"
},
[2400105]={
["desc"]="巨剑轰击技能伤害大服增加，并有50%概率附加禁锢效果，1回合。"
},
[2400106]={
["desc"]="巨剑轰击附加禁锢效果的概率提高到70%。"
},
[2400107]={
["desc"]="巨剑轰击将造成双倍伤害。"
},
[3200100]={
["desc"]="解锁长枪突刺：额外造成一次技能伤害。"
}, },
[3200101]={ [3200101]={
["desc"]="长枪突刺：阿斯克可造成<color=#3cff28>1</color>次大量伤害" ["desc"]="长枪突刺可恢复一定量生命。"
}, },
[3200102]={ [3200102]={
["desc"]="长枪突刺可<color=#3cff28>恢复生命</color>" ["desc"]="长枪突刺对中毒敌人的伤害增加50%。"
}, },
[3200103]={ [3200103]={
["desc"]="长枪突刺<color=#3cff28>伤害提升</color>" ["desc"]="长枪突刺伤害提升。"
}, },
[3200104]={ [3200104]={
["desc"]="长枪突刺有<color=#3cff28>30%</color>概率眩晕对手<color=#3cff28>1</color>回合" ["desc"]="长枪突刺沿X方向可额外消除4格。"
},
[3200105]={
["desc"]="长枪突刺有30%概率附加眩晕效果，1回合。"
},
[3200106]={
["desc"]="长枪突刺眩晕几率提高20%"
},
[3200107]={
["desc"]="长枪突刺后为团队增加20%格挡，2回合"
},
[3300100]={
["desc"]="解锁急速治疗：使用后本次恢复生命。"
}, },
[3300101]={ [3300101]={
["desc"]="快速治愈：艾芙琳可恢复<color=#3cff28>150%</color>攻击力的生命值" ["desc"]="急速治疗回血效果提升。"
}, },
[3300102]={ [3300102]={
["desc"]="快速治愈的<color=#3cff28>恢复量提升</color>" ["desc"]="急速治疗使用时本次普攻伤害提升15%。"
}, },
[3300103]={ [3300103]={
["desc"]="快速治愈使用时本次普攻伤害提升<color=#3cff28>15%</color>" ["desc"]="急速治疗沿＋方向可额外消除4格。"
}, },
[3300104]={ [3300104]={
["desc"]="连接快速治愈的每一击都将<color=#3cff28>恢复</color>生命值" ["desc"]="急速治疗额外为团队提供技能伤害提升效果，2回合。"
},
[3300105]={
["desc"]="急速治疗使用时本次普攻每一击都将恢复生命。"
},
[3300106]={
["desc"]="急速治疗附加的技能伤害提升效果，回合数+1。"
},
[3300107]={
["desc"]="急速治疗链接超过5个元素，回血效果提升。"
},
[3300200]={
["desc"]="解锁森林狼技能：使用后本次伤害提升，并造成多次技能伤害。"
},
[3300201]={
["desc"]="森林狼技能有50%概率附加易伤效果，2回合。"
},
[3300202]={
["desc"]="森林狼技能使用时本次普攻伤害提升15%。"
},
[3300203]={
["desc"]="森林狼技能伤害提升。"
},
[3300204]={
["desc"]="森林狼技能对中毒敌人有50%概率附加中毒效果，2回合。"
},
[3300205]={
["desc"]="森林狼技能附加的中毒效果，伤害提升。"
},
[3300206]={
["desc"]="森林狼技能攻击提升15%。"
},
[3300207]={
["desc"]="森林狼技能对中毒敌人有100%概率附加中毒效果，2回合。"
},
[3400100]={
["desc"]="解锁流星追月：使用后本次伤害提升，并一次巨量技能伤害。"
},
[3400101]={
["desc"]="流星追月可附加易伤效果，2回合。"
},
[3400102]={
["desc"]="流星追月沿＋方向可额外消除4格。"
},
[3400103]={
["desc"]="木兰攻击提升15%。"
},
[3400104]={
["desc"]="流星追月附加的易伤效果，效果提升。"
},
[3400105]={
["desc"]="流星追月可附加流血效果，2回合。"
},
[3400106]={
["desc"]="流星追月附加的流血效果，伤害提升。"
},
[3400107]={
["desc"]="流星追月链接超过4个元素，流星追月攻击将释放2次。"
},
[4200100]={
["desc"]="解锁元素链接：随机消除3个元素，并造成一次技能伤害。"
}, },
[4200101]={ [4200101]={
["desc"]="元素链接：随机额外消除<color=#3cff28>3</color>个元素" ["desc"]="元素链接随机消除元素+2。"
}, },
[4200102]={ [4200102]={
["desc"]="元素链接随机消除元素增加<color=#3cff28>2</color>个" ["desc"]="元素链接使用时本次普攻伤害提升10%。"
}, },
[4200103]={ [4200103]={
["desc"]="元素链接使用时本次普攻伤害提升<color=#3cff28>10%</color>" ["desc"]="元素链接有50%概率附加冰霜效果，2回合。"
}, },
[4200104]={ [4200104]={
["desc"]="元素链接随机消除元素增加<color=#3cff28>2</color>个" ["desc"]="元素链接随机消除元素+2。"
},
[4200105]={
["desc"]="元素链接对冰霜敌人有20%概率附加冻结效果，1回合。"
},
[4200106]={
["desc"]="蓝法攻击提升15%。"
},
[4200107]={
["desc"]="元素链接附加冻结效果概率提升到40%。"
},
[4300100]={
["desc"]="解锁冰女技能：额外造成一次技能伤害，附加冰霜效果，1回合。"
},
[4300101]={
["desc"]="冰女技能沿＋方向可额外消除4格。"
},
[4300102]={
["desc"]="冰女技能对灼烧敌人的伤害增加50%。"
},
[4300103]={
["desc"]="冰女技能附加的冰霜效果，回合数+1。"
},
[4300104]={
["desc"]="冰女技能伤害提升。"
},
[4300105]={
["desc"]="冰女技能对冰霜敌人有50%概率附加冻结效果，1回合。"
},
[4300106]={
["desc"]="冰女技能后为团队附加冰盾效果，2回合。"
},
[4300107]={
["desc"]="冰女技能附加的冰盾，可反伤400%。"
},
[4300300]={
["desc"]="解锁鸦姐技能：额外造成一次技能伤害，附加腐败效果，1回合。"
},
[4300301]={
["desc"]="鸦姐技能附加的腐败效果，回合数+1."
},
[4300302]={
["desc"]="鸦姐技能对易伤敌人附加冰霜效果，1回合。"
},
[4300303]={
["desc"]="鸦姐技能使用时本次普攻伤害提升15%。"
},
[4300304]={
["desc"]="鸦姐技能附加的冰霜效果，回合数+1。"
},
[4300305]={
["desc"]="鸦姐技能附加削弱效果，2回合。"
},
[4300306]={
["desc"]="鸦姐技能沿＋方向可额外消除4格。"
},
[4300307]={
["desc"]="鸦姐技能附加的削弱效果，回合数+2。"
},
[4400100]={
["desc"]="解锁冰霜剑舞：随机消除3个元素，并造成一次技能伤害，附加冰霜效果，1回合。"
}, },
[4400101]={ [4400101]={
["desc"]="霜冻剑舞：造成<color=#3cff28>1</color>次伤害并施加<color=#3cff28>1</color>回合冰霜效果" ["desc"]="冰霜剑舞附加的冰霜效果，回合数+1"
}, },
[4400102]={ [4400102]={
["desc"]="霜冻剑舞被使用时可消除掉其上下左右<color=#3cff28>4</color>个元素" ["desc"]="冰霜剑舞对灼烧敌人伤害增加50%。"
}, },
[4400103]={ [4400103]={
["desc"]="霜冻剑舞<color=#3cff28>伤害提升</color>" ["desc"]="冰霜剑舞随机消除元素+3"
}, },
[4400104]={ [4400104]={
["desc"]="霜冻剑舞造成的冰霜效果将持续<color=#3cff28>2</color>回合" ["desc"]="冰霜剑舞附加的冰霜效果，效果提升。"
},
[4400105]={
["desc"]="霜冻剑舞有50%概率附加冻结效果，2回合。"
},
[4400106]={
["desc"]="寒冰妖姬攻击提升15%。"
},
[4400107]={
["desc"]="霜冻剑舞附加冻结效果概率提升到70%。"
},
[5200100]={
["desc"]="解锁护盾术：为团队附加一个护盾，1回合。"
}, },
[5200101]={ [5200101]={
["desc"]="魔法罩：艾伦可生成一个魔法罩持续<color=#3cff28>1</color>回合" ["desc"]="护盾术附加的护盾，承受伤害增加。"
}, },
[5200102]={ [5200102]={
["desc"]="增加魔法罩承受<color=#3cff28>伤害增加</color>。" ["desc"]="护盾术使用时本次普攻伤害提升10%。"
}, },
[5200103]={ [5200103]={
["desc"]="生成的魔法罩如果没有破可以额外持续<color=#3cff28>1</color>回合" ["desc"]="护盾术附加的护盾，回合数+1。"
}, },
[5200104]={ [5200104]={
["desc"]="魔法罩存在时可反伤对方造成<color=#3cff28>200%伤害</color>" ["desc"]="护盾术沿＋方向可额外消除4格。"
},
[5200105]={
["desc"]="护盾术附加的护盾，可反伤200%。"
},
[5200106]={
["desc"]="忍者伦攻击提升15%。"
},
[5200107]={
["desc"]="护盾术附加的护盾，反伤效果翻倍。"
},
[5300100]={
["desc"]="解锁魔女琪琪技能：额外造成一次大量技能伤害。"
},
[5300101]={
["desc"]="魔女琪琪技能可附加中毒效果，2回合。"
},
[5300102]={
["desc"]="魔女琪琪技能使用时本次普攻伤害提升15%。"
},
[5300103]={
["desc"]="魔女琪琪技能可附加昏睡效果，2回合。"
},
[5300104]={
["desc"]="魔女琪琪技能附加的中毒效果，伤害提升。"
},
[5300105]={
["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。"
},
[5300106]={
["desc"]="魔女琪琪技能使用后随机增加一种技能的能量2点。"
},
[5300107]={
["desc"]="魔女琪琪技能有15%概率为团队附加不死效果，1回合。"
},
[5300200]={
["desc"]="解锁灵魂猎手技能：额外造成一次大量技能伤害。"
},
[5300201]={
["desc"]="灵魂猎手技能沿＋方向可额外消除4格。"
},
[5300202]={
["desc"]="灵魂猎手技能对冰霜敌人有50%概率附加冻结效果，1回合。"
},
[5300203]={
["desc"]="灵魂猎手技能伤害提升。"
},
[5300204]={
["desc"]="灵魂猎手攻击提升15%。"
},
[5300205]={
["desc"]="灵魂猎手技能有50%概率为团队附加反击效果，2回合。"
},
[5300206]={
["desc"]="灵魂猎手技能附加冻结效果，概率提升到70%，回合数+1。"
},
[5300207]={
["desc"]="灵魂猎手技能附加反击效果，概率提升到100%。"
},
[5400100]={
["desc"]="解锁蝴蝶技能：额外造成一次大量技能伤害。"
},
[5400101]={
["desc"]="蝴蝶技能伤害提升。"
},
[5400102]={
["desc"]="蝴蝶技能使用后随机增加一种技能的能量2点。"
},
[5400103]={
["desc"]="蝴蝶技能使用后将场上随机3个元素变为紫色元素。"
},
[5400104]={
["desc"]="蝴蝶攻击提升15%。"
},
[5400105]={
["desc"]="蝴蝶技能激活所需能量-2。"
},
[5400106]={
["desc"]="蝴蝶技能每击杀1个敌人，技能伤害提升50%。"
},
[5400107]={
["desc"]="蝴蝶技能击杀敌人后将增加蝴蝶技能能量2点。"
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/de/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/de/item.lua
View File

@ -47,7 +47,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -56,7 +65,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -64,6 +73,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -73,18 +85,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

21
lua/app/config/strings/de/mail.lua Normal file
View File

@ -0,0 +1,21 @@
local mail = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
}
}
local config = {
data=mail,count=5
}
return config

10
lua/app/config/strings/de/mail.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 3a1954dd8e9d1c54c981ef71c96077be
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

56
lua/app/config/strings/de/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/de/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/en/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

47
lua/app/config/strings/en/item.lua
View File

@ -50,27 +50,39 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
},
[13001]={
["name"]="Roxy Shard", ["name"]="Roxy Shard",
["desc"]="Roxy Shard, collect it to unlock or upgrade Roxy" ["desc"]="Roxy Shard, collect it to unlock or upgrade Roxy"
}, },
[13001]={ [13002]={
["name"]="Carla Shard", ["name"]="Carla Shard",
["desc"]="Carla Shard, collect it to unlock or upgrade Carla" ["desc"]="Carla Shard, collect it to unlock or upgrade Carla"
}, },
[13002]={ [14001]={
["name"]="Great Sword Robert Shard", ["name"]="Great Sword Robert Shard",
["desc"]="Great Sword Robert Shard, collect it to unlock or upgrade Great Sword Robert" ["desc"]="Great Sword Robert Shard, collect it to unlock or upgrade Great Sword Robert"
}, },
[24001]={ [22001]={
["name"]="Aske Shard", ["name"]="Aske Shard",
["desc"]="Aske Shard, collect it to unlock or upgrade Aske" ["desc"]="Aske Shard, collect it to unlock or upgrade Aske"
}, },
[22001]={ [23001]={
["name"]="Evelyn Shard", ["name"]="Evelyn Shard",
["desc"]="Evelyn Shard, collect it to unlock or upgrade Evelyn" ["desc"]="Evelyn Shard, collect it to unlock or upgrade Evelyn"
}, },
[23001]={ [23002]={
["name"]="Lilith Shard", ["name"]="Lilith Shard",
["desc"]="Lilith Shard, collect it to unlock or upgrade Lilith" ["desc"]="Lilith Shard, collect it to unlock or upgrade Lilith"
}, },
@ -84,18 +96,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

24
lua/app/config/strings/en/mail.lua Normal file
View File

@ -0,0 +1,24 @@
local mail = {
[1]={
["name"]="Bestowal of the Elder"
},
[2]={
["name"]="Daily Allowance of the King"
},
[3]={
["name"]="Hey! See what's inside!",
["desc"]="An optimistic person is always surprised by the unexpected"
},
[4]={
["name"]="To my beloved...",
["desc"]="A good heart will be rewarded with good deeds"
},
[5]={
["name"]="Thrive!",
["desc"]="Good energy, good luck and good fortune"
}
}
local config = {
data=mail,count=5
}
return config

10
lua/app/config/strings/en/mail.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 90d8b11fdee6134419f8e702ab468cf5
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

68
lua/app/config/strings/en/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
["desc"]="Lance Thrust: Dealing tons of damage"
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
["desc"]="Unsheathe: Dealing tons of damage"
}, },
[4200120]={ [2300120]={
["desc"]="Elemental Link: Clear random 3 extra elements"
}, },
[5200120]={ [2300220]={
["desc"]="Magic Shield: Generates a Magic Shield that absorbs damage up to 10% of your Max HP. The shield lasts for 1 round"
},
[1200120]={
["desc"]="Disperse in Dance: Clears elements on <color=#3cff28>2</color> tiles on the left and right side"
},
[3300120]={
["desc"]="Quick Regen: Immediately restores HP by an amount equal to 150% of Evelyn's Attack"
}, },
[2400120]={ [2400120]={
["desc"]="Great Sword Combos: Increases the damage of each attack by 50%, ends with a huge sword that deals tons of damage"
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
["desc"]="Frosty Blade Dance: Deals massive damage for one time and the applies Frost status on the enemy for 1 round (normal attack hits -2)"
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

450
lua/app/config/strings/en/skill_rogue.lua
View File

@ -130,105 +130,489 @@ local skill_rogue = {
}, },
[44]={ [44]={
["desc"]="Turns <color=#3cff28>5</color> random Non-Purple elements into Purple" ["desc"]="Turns <color=#3cff28>5</color> random Non-Purple elements into Purple"
},
[1200100]={
}, },
[1200101]={ [1200101]={
["desc"]="Disperse in Dance: Clears elements on <color=#3cff28>2</color> tiles on the left and right"
}, },
[1200102]={ [1200102]={
["desc"]="Disperse in Dance clears elements on <color=#3cff28>1</color> extra tile on the top and bottom"
}, },
[1200103]={ [1200103]={
["desc"]="Increases the damage of normal attacks by <color=#3cff28>10%</color> by using Disperse in Dance"
}, },
[1200104]={ [1200104]={
["desc"]="Increases Block Chance by <color=#3cff28>2%</color> in the current round for every 1 element connected to Disperse in Dance"
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
["desc"]="Unsheathe: Carla deals massive damage for <color=#3cff28>1</color> time"
}, },
[2200102]={ [2200102]={
["desc"]="<color=#3cff28>Increases the damage</color> of Unsheathe"
}, },
[2200103]={ [2200103]={
["desc"]="When performing Unsheathe, clears <color=#3cff28>1</color> tile on the top, bottom, left and right side respectively."
}, },
[2200104]={ [2200104]={
["desc"]="Unsheathe Ultimate Skill can be unleashed for <color=#3cff28>twice</color>"
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
["desc"]="Great Sword Combos: Increases the damage of each attack by <color=#3cff28>50%</color>"
}, },
[2400102]={ [2400102]={
["desc"]="Great Sword Combos clears <color=#3cff28>4</color> elements on the top, bottom, left and right side when connected"
}, },
[2400103]={ [2400103]={
["desc"]="Increases the damage of normal attacks by <color=#3cff28>20%</color> by using Great Sword Combos"
}, },
[2400104]={ [2400104]={
["desc"]="Great Sword Combos clears <color=#3cff28>4</color> elements on the diagonal directions when connected"
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
["desc"]="Lance Thrust: Aske deals massive damage for <color=#3cff28>1</color> time"
}, },
[3200102]={ [3200102]={
["desc"]="Lance Thrust <color=#3cff28>restores HP</color>"
}, },
[3200103]={ [3200103]={
["desc"]="<color=#3cff28>Increases the damage</color> of Lance Thrust"
}, },
[3200104]={ [3200104]={
["desc"]="Lance Thrust has a <color=#3cff28>30%</color> chance to stun the enemy for <color=#3cff28>1</color> round"
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
["desc"]="Quick Regen: Evelyn can restore HP equal to <color=#3cff28>150%</color> of her Attack"
}, },
[3300102]={ [3300102]={
["desc"]="Increases the <color=#3cff28>amount of HP restored</color> by Quick Regen"
}, },
[3300103]={ [3300103]={
["desc"]="Increases the damage of normal attacks by <color=#3cff28>15%</color> by using Quick Regen"
}, },
[3300104]={ [3300104]={
["desc"]="Each attack of elements connected by the same link of Quick Regen <color=#3cff28>restores HP</color>"
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
["desc"]="Elemental Link: Clears random <color=#3cff28>3</color> extra elements"
}, },
[4200102]={ [4200102]={
["desc"]="Increases the number of random elements cleared by Elemental Link by <color=#3cff28>2</color>"
}, },
[4200103]={ [4200103]={
["desc"]="Increases the damage of normal attacks by <color=#3cff28>10%</color> by using Elemental Link "
}, },
[4200104]={ [4200104]={
["desc"]="Increases the number of random elements cleared by Elemental Link by <color=#3cff28>2</color>"
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
["desc"]="Frosty Blade Dance: Deal the damage for <color=#3cff28>1</color> hit and applies Frost status for <color=#3cff28>1</color> round"
}, },
[4400102]={ [4400102]={
["desc"]="When performing Frosty Blade Dance, clears <color=#3cff28>4</color> elements on the top, bottom, left and right side"
}, },
[4400103]={ [4400103]={
["desc"]="<color=#3cff28>Increases the damage</color> of Frosty Blade Dance"
}, },
[4400104]={ [4400104]={
["desc"]="Frost status caused by Frosty Blade Dance lasts for <color=#3cff28>2</color> rounds"
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
["desc"]="Magic Shield: Allen generates a Magic Shield that lasts for <color=#3cff28>1</color> round"
}, },
[5200102]={ [5200102]={
["desc"]="<color=#3cff28>Increases the damage taken</color> by the Magic Shield"
}, },
[5200103]={ [5200103]={
["desc"]="Magic Shield lasts for <color=#3cff28>1</color> more round if it isn’t destroyed"
}, },
[5200104]={ [5200104]={
["desc"]="Magic Shield reflects and deals <color=#3cff28>200% damage</color> back to the enemy when activated"
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/fr/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/fr/item.lua
View File

@ -47,7 +47,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -56,7 +65,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -64,6 +73,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -73,18 +85,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

24
lua/app/config/strings/fr/mail.lua Normal file
View File

@ -0,0 +1,24 @@
local mail = {
[1]={
["name"]="Cadeau d'un grand-père au bord de la route"
},
[2]={
["name"]="Approvisionnement quotidien du roi"
},
[3]={
["name"]="Hoho hahé",
["desc"]="Une personne optimiste est toujours surprise par l'inattendu"
},
[4]={
["name"]="Le bienveillant invincible",
["desc"]="Une personne au bon cœur sera récompensée par de bonnes actions"
},
[5]={
["name"]="En plein forme",
["desc"]="Bonne énergie, bonne chance et bonne fortune"
}
}
local config = {
data=mail,count=5
}
return config

10
lua/app/config/strings/fr/mail.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: eb850ef427dabc54794afaf8bcedf737
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

56
lua/app/config/strings/fr/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/fr/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/id/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/id/item.lua
View File

@ -47,7 +47,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -56,7 +65,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -64,6 +73,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -73,18 +85,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

56
lua/app/config/strings/id/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/id/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/ja/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/ja/item.lua
View File

@ -47,7 +47,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -56,7 +65,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -64,6 +73,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -73,18 +85,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

21
lua/app/config/strings/ja/mail.lua Normal file
View File

@ -0,0 +1,21 @@
local mail = {
[1]={
},
[2]={
},
[3]={
},
[4]={
},
[5]={
}
}
local config = {
data=mail,count=5
}
return config

10
lua/app/config/strings/ja/mail.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 2cea8977c8008a84685fa9c216ea4e6d
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

56
lua/app/config/strings/ja/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/ja/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/ko/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/ko/item.lua
View File

@ -47,7 +47,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -56,7 +65,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -64,6 +73,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -73,18 +85,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

24
lua/app/config/strings/ko/mail.lua Normal file
View File

@ -0,0 +1,24 @@
local mail = {
[1]={
["name"]="길 가던 할아버지가 던져 준 선물"
},
[2]={
["name"]="왕의 일상 보급품"
},
[3]={
["name"]="으랏차차!",
["desc"]="낙관적 인 사람은 항상 예상치 못한 것에 놀란다."
},
[4]={
["name"]="자비로운 자는 무적입니다.",
["desc"]="마음이 착한 사람은 선행으로 보상을받을 것입니다."
},
[5]={
["name"]="막힘없이 뻗어나가요!",
["desc"]="좋은 에너지, 행운과 행운"
}
}
local config = {
data=mail,count=5
}
return config

10
lua/app/config/strings/ko/mail.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: fe3092af5b4df5c48a321faee19026de
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

56
lua/app/config/strings/ko/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/ko/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/pt/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/pt/item.lua
View File

@ -46,7 +46,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -55,7 +64,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -63,6 +72,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -72,18 +84,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

56
lua/app/config/strings/pt/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/pt/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/ru/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/ru/item.lua
View File

@ -44,7 +44,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -53,7 +62,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -61,6 +70,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -70,18 +82,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

56
lua/app/config/strings/ru/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/ru/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/th/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/th/item.lua
View File

@ -44,7 +44,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -53,7 +62,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -61,6 +70,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -70,18 +82,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

56
lua/app/config/strings/th/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/th/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/vi/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

39
lua/app/config/strings/vi/item.lua
View File

@ -47,7 +47,16 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
},
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
@ -56,7 +65,7 @@ local item = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -64,6 +73,9 @@ local item = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -73,18 +85,39 @@ local item = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

56
lua/app/config/strings/vi/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
}, },
[4200120]={ [2300120]={
}, },
[5200120]={ [2300220]={
},
[1200120]={
},
[3300120]={
}, },
[2400120]={ [2400120]={
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

386
lua/app/config/strings/vi/skill_rogue.lua
View File

@ -130,6 +130,9 @@ local skill_rogue = {
}, },
[44]={ [44]={
},
[1200100]={
}, },
[1200101]={ [1200101]={
@ -142,6 +145,90 @@ local skill_rogue = {
}, },
[1200104]={ [1200104]={
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
@ -154,6 +241,66 @@ local skill_rogue = {
}, },
[2200104]={ [2200104]={
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
@ -166,6 +313,18 @@ local skill_rogue = {
}, },
[2400104]={ [2400104]={
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
@ -178,6 +337,18 @@ local skill_rogue = {
}, },
[3200104]={ [3200104]={
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
@ -190,6 +361,66 @@ local skill_rogue = {
}, },
[3300104]={ [3300104]={
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
@ -202,6 +433,66 @@ local skill_rogue = {
}, },
[4200104]={ [4200104]={
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
@ -214,6 +505,18 @@ local skill_rogue = {
}, },
[4400104]={ [4400104]={
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
@ -226,9 +529,90 @@ local skill_rogue = {
}, },
[5200104]={ [5200104]={
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

28
lua/app/config/strings/zh/hero.lua
View File

@ -8,7 +8,7 @@ local hero = {
[13002]={ [13002]={
}, },
[24001]={ [14001]={
}, },
[22001]={ [22001]={
@ -16,6 +16,9 @@ local hero = {
}, },
[23001]={ [23001]={
},
[23002]={
}, },
[24001]={ [24001]={
@ -25,18 +28,39 @@ local hero = {
}, },
[33001]={ [33001]={
},
[33002]={
},
[34001]={
}, },
[42001]={ [42001]={
},
[43001]={
},
[43002]={
}, },
[44001]={ [44001]={
}, },
[52001]={ [52001]={
},
[53001]={
},
[53002]={
},
[54001]={
} }
} }
local config = { local config = {
data=hero,count=12 data=hero,count=20
} }
return config return config

71
lua/app/config/strings/zh/item.lua
View File

@ -50,52 +50,85 @@ local item = {
[15]={ [15]={
}, },
[12001]={ [16]={
["name"]="红R舞女碎片",
["desc"]="洛克西英雄碎片,湊齊可解鎖或升級。" },
[17]={
},
[18]={
},
[19]={
}, },
[13001]={ [13001]={
["name"]="红SR-克劳德碎片", ["name"]="红SR-克劳德",
["desc"]="卡拉英雄碎片,湊齊可解鎖或升級。" ["desc"]="洛克西英雄碎片,湊齊可解鎖或升級。"
}, },
[13002]={ [13002]={
["name"]="红SR-武僧碎片", ["name"]="红SR-武僧",
["desc"]="卡拉英雄碎片,湊齊可解鎖或升級。"
},
[14001]={
["name"]="红SSR-铁锤小孩",
["desc"]="巨劍羅伯特英雄碎片,湊齊可解鎖或升級。" ["desc"]="巨劍羅伯特英雄碎片,湊齊可解鎖或升級。"
}, },
[24001]={ [22001]={
["name"]="红SSR-铁锤小孩碎片", ["name"]="黄R黑妹",
["desc"]="阿斯克英雄碎片,湊齊可解鎖或升級。" ["desc"]="阿斯克英雄碎片,湊齊可解鎖或升級。"
}, },
[22001]={ [23001]={
["name"]="黄R黑妹碎片", ["name"]="黄SR野蛮人",
["desc"]="艾芙琳英雄碎片,湊齊可解鎖或升級。" ["desc"]="艾芙琳英雄碎片,湊齊可解鎖或升級。"
}, },
[23001]={ [23002]={
["name"]="黄SR野蛮人碎片", ["name"]="黄SR二丫",
["desc"]="莉莉絲英雄碎片,湊齊可解鎖或升級。" ["desc"]="莉莉絲英雄碎片,湊齊可解鎖或升級。"
}, },
[24001]={ [24001]={
["name"]="黄ssr巨剑碎片", ["name"]="黄ssr巨剑",
["desc"]="白髮凱瑟琳英雄碎片,湊齊可解鎖或升級。" ["desc"]="白髮凱瑟琳英雄碎片,湊齊可解鎖或升級。"
}, },
[32001]={ [32001]={
["name"]="绿R洋葱碎片", ["name"]="绿R洋葱",
["desc"]="艾倫英雄碎片,湊齊可解鎖或升級。" ["desc"]="艾倫英雄碎片,湊齊可解鎖或升級。"
}, },
[33001]={ [33001]={
["name"]="绿SR小鹿碎片" ["name"]="绿SR小鹿"
},
[33002]={
["name"]="绿SR森林狼"
},
[34001]={
["name"]="绿SSR花木兰"
}, },
[42001]={ [42001]={
["name"]="蓝R莉莉丝碎片" ["name"]="蓝R莉莉丝"
},
[43001]={
["name"]="蓝SR冰女"
},
[43002]={
["name"]="蓝SR鸦姐"
}, },
[44001]={ [44001]={
["name"]="蓝SSR冰刃碎片" ["name"]="蓝SSR冰刃"
}, },
[52001]={ [52001]={
["name"]="紫R忍者碎片" ["name"]="紫R忍者"
},
[53001]={
["name"]="紫SR女巫"
},
[53002]={
["name"]="紫SR德古拉"
},
[54001]={
["name"]="紫SSR蝴蝶"
} }
} }
local config = { local config = {
data=item,count=27 data=item,count=38
} }
return config return config

24
lua/app/config/strings/zh/mail.lua Normal file
View File

@ -0,0 +1,24 @@
local mail = {
[1]={
["name"]="路邊老爺爺的饋贈"
},
[2]={
["name"]="國王的日常補給"
},
[3]={
["name"]="哼哼哈嘿",
["desc"]="樂觀的人總在不經意間獲得意外之喜"
},
[4]={
["name"]="仁者無敵",
["desc"]="心地善良的人,會善有善報的"
},
[5]={
["name"]="風生水起",
["desc"]="精力充沛,運勢良好,財運連連"
}
}
local config = {
data=mail,count=5
}
return config

10
lua/app/config/strings/zh/mail.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 82da7c0e4ab2825488868c862fa80ec1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

68
lua/app/config/strings/zh/skill.lua
View File

@ -1,30 +1,66 @@
local skill = { local skill = {
[3200120]={ [1200120]={
["desc"]="長槍突刺：造成1次大量傷害"
},
[1300120]={
},
[1300220]={
},
[1400120]={
}, },
[2200120]={ [2200120]={
["desc"]="拔刀斬：造成1次大量傷害"
}, },
[4200120]={ [2300120]={
["desc"]="元素鏈接：隨機額外消除3個元素"
}, },
[5200120]={ [2300220]={
["desc"]="魔法罩：生成一個魔法罩持續1回合，可承受最大生命值10%傷害"
},
[1200120]={
["desc"]="舞步消散：將左右2格元素進行消除"
},
[3300120]={
["desc"]="快速治癒：立即恢復艾芙琳150%攻擊力的生命值"
}, },
[2400120]={ [2400120]={
["desc"]="巨劍連斬：攻擊傷害增加50%，結束時使用巨劍造成大量傷害。"
},
[3200120]={
},
[3300120]={
},
[3300220]={
},
[3400120]={
},
[4200120]={
},
[4300120]={
},
[4300220]={
}, },
[4400120]={ [4400120]={
["desc"]="霜凍劍舞：造成1次大量傷害並給敵人1回合冰霜效果（普攻次數-2）"
},
[5200120]={
},
[5300120]={
},
[5300220]={
},
[5400120]={
} }
} }
local config = { local config = {
data=skill,count=8 data=skill,count=20
} }
return config return config

450
lua/app/config/strings/zh/skill_rogue.lua
View File

@ -130,105 +130,489 @@ local skill_rogue = {
}, },
[44]={ [44]={
["desc"]="將場上隨機<color=#3cff28>5</color>個非紫色元素變為紫色" ["desc"]="將場上隨機<color=#3cff28>5</color>個非紫色元素變為紫色"
},
[1200100]={
}, },
[1200101]={ [1200101]={
["desc"]="舞步消散：將左右<color=#3cff28>2</color>格元素進行消除"
}, },
[1200102]={ [1200102]={
["desc"]="舞步消散上下可多消<color=#3cff28>1</color>格"
}, },
[1200103]={ [1200103]={
["desc"]="舞步消散使用時本次普攻傷害提升<color=#3cff28>10%</color>"
}, },
[1200104]={ [1200104]={
["desc"]="每有1個元素連接舞步消散則本回合格擋增加<color=#3cff28>2%</color>"
},
[1200105]={
},
[1200106]={
},
[1200107]={
},
[1300100]={
},
[1300101]={
},
[1300102]={
},
[1300103]={
},
[1300104]={
},
[1300105]={
},
[1300106]={
},
[1300107]={
},
[1300200]={
},
[1300201]={
},
[1300202]={
},
[1300203]={
},
[1300204]={
},
[1300205]={
},
[1300206]={
},
[1300207]={
},
[1400100]={
},
[1400101]={
},
[1400102]={
},
[1400103]={
},
[1400104]={
},
[1400105]={
},
[1400106]={
},
[1400107]={
},
[2200100]={
}, },
[2200101]={ [2200101]={
["desc"]="拔刀斬：卡拉可造成<color=#3cff28>1</color>次大量傷害"
}, },
[2200102]={ [2200102]={
["desc"]="拔刀斬<color=#3cff28>傷害提升</color>"
}, },
[2200103]={ [2200103]={
["desc"]="拔刀斬釋放時上下左右各消除<color=#3cff28>1</color>格"
}, },
[2200104]={ [2200104]={
["desc"]="拔刀斬終結技可放<color=#3cff28>2</color>次"
},
[2200105]={
},
[2200106]={
},
[2200107]={
},
[2300100]={
},
[2300101]={
},
[2300102]={
},
[2300103]={
},
[2300104]={
},
[2300105]={
},
[2300106]={
},
[2300107]={
},
[2300200]={
},
[2300201]={
},
[2300202]={
},
[2300203]={
},
[2300204]={
},
[2300205]={
},
[2300206]={
},
[2300207]={
},
[2400100]={
}, },
[2400101]={ [2400101]={
["desc"]="巨劍連斬：每一次攻擊的傷害將增加<color=#3cff28>50%</color>"
}, },
[2400102]={ [2400102]={
["desc"]="巨劍連斬被連接消除其上下左右<color=#3cff28>4</color>個元素"
}, },
[2400103]={ [2400103]={
["desc"]="巨劍連斬使用時本次普攻傷害提升<color=#3cff28>20%</color>"
}, },
[2400104]={ [2400104]={
["desc"]="巨劍連斬被連接消除其斜方向的<color=#3cff28>4</color>個元素"
},
[2400105]={
},
[2400106]={
},
[2400107]={
},
[3200100]={
}, },
[3200101]={ [3200101]={
["desc"]="長槍突刺：阿斯克可造成<color=#3cff28>1</color>次大量傷害"
}, },
[3200102]={ [3200102]={
["desc"]="長槍突刺可<color=#3cff28>恢復生命</color>"
}, },
[3200103]={ [3200103]={
["desc"]="長槍突刺<color=#3cff28>傷害提升</color>"
}, },
[3200104]={ [3200104]={
["desc"]="長槍突刺有<color=#3cff28>30%</color>概率眩暈對手<color=#3cff28>1</color>回合"
},
[3200105]={
},
[3200106]={
},
[3200107]={
},
[3300100]={
}, },
[3300101]={ [3300101]={
["desc"]="快速治癒：艾芙琳可恢復<color=#3cff28>150%</color>攻擊力的生命值"
}, },
[3300102]={ [3300102]={
["desc"]="快速治癒的<color=#3cff28>恢復量提升</color>"
}, },
[3300103]={ [3300103]={
["desc"]="快速治癒使用時本次普攻傷害提升<color=#3cff28>15%</color>"
}, },
[3300104]={ [3300104]={
["desc"]="連接快速治癒的每一擊都將<color=#3cff28>恢復</color>生命值"
},
[3300105]={
},
[3300106]={
},
[3300107]={
},
[3300200]={
},
[3300201]={
},
[3300202]={
},
[3300203]={
},
[3300204]={
},
[3300205]={
},
[3300206]={
},
[3300207]={
},
[3400100]={
},
[3400101]={
},
[3400102]={
},
[3400103]={
},
[3400104]={
},
[3400105]={
},
[3400106]={
},
[3400107]={
},
[4200100]={
}, },
[4200101]={ [4200101]={
["desc"]="元素鏈接：隨機額外消除<color=#3cff28>3</color>個元素"
}, },
[4200102]={ [4200102]={
["desc"]="元素鏈接隨機消除元素增加<color=#3cff28>2</color>個"
}, },
[4200103]={ [4200103]={
["desc"]="元素鏈接使用時本次普攻傷害提升<color=#3cff28>10%</color>"
}, },
[4200104]={ [4200104]={
["desc"]="元素鏈接隨機消除元素增加<color=#3cff28>2</color>個"
},
[4200105]={
},
[4200106]={
},
[4200107]={
},
[4300100]={
},
[4300101]={
},
[4300102]={
},
[4300103]={
},
[4300104]={
},
[4300105]={
},
[4300106]={
},
[4300107]={
},
[4300300]={
},
[4300301]={
},
[4300302]={
},
[4300303]={
},
[4300304]={
},
[4300305]={
},
[4300306]={
},
[4300307]={
},
[4400100]={
}, },
[4400101]={ [4400101]={
["desc"]="霜凍劍舞：造成<color=#3cff28>1</color>次傷害並施加<color=#3cff28>1</color>回合冰霜效果"
}, },
[4400102]={ [4400102]={
["desc"]="霜凍劍舞被使用時可消除掉其上下左右<color=#3cff28>4</color>個元素"
}, },
[4400103]={ [4400103]={
["desc"]="霜凍劍舞<color=#3cff28>傷害提升</color>"
}, },
[4400104]={ [4400104]={
["desc"]="霜凍劍舞造成的冰霜效果將持續<color=#3cff28>2</color>回合"
},
[4400105]={
},
[4400106]={
},
[4400107]={
},
[5200100]={
}, },
[5200101]={ [5200101]={
["desc"]="魔法罩：艾倫可生成一個魔法罩持續<color=#3cff28>1</color>回合"
}, },
[5200102]={ [5200102]={
["desc"]="增加魔法罩承受<color=#3cff28>傷害增加</color>。"
}, },
[5200103]={ [5200103]={
["desc"]="生成的魔法罩如果沒有破可以額外持續<color=#3cff28>1</color>回合"
}, },
[5200104]={ [5200104]={
["desc"]="魔法罩存在時可反傷對方造成<color=#3cff28>200%傷害</color>"
},
[5200105]={
},
[5200106]={
},
[5200107]={
},
[5300100]={
},
[5300101]={
},
[5300102]={
},
[5300103]={
},
[5300104]={
},
[5300105]={
},
[5300106]={
},
[5300107]={
},
[5300200]={
},
[5300201]={
},
[5300202]={
},
[5300203]={
},
[5300204]={
},
[5300205]={
},
[5300206]={
},
[5300207]={
},
[5400100]={
},
[5400101]={
},
[5400102]={
},
[5400103]={
},
[5400104]={
},
[5400105]={
},
[5400106]={
},
[5400107]={
} }
} }
local config = { local config = {
data=skill_rogue,count=76 data=skill_rogue,count=204
} }
return config return config

9
lua/app/config/struct.lua
View File

@ -28,9 +28,16 @@ local struct = {
["parameter1"]="type:string", ["parameter1"]="type:string",
["parameter2"]="minnum:int", ["parameter2"]="minnum:int",
["parameter3"]="maxnum:int" ["parameter3"]="maxnum:int"
},
["condition"]={
["parameter1"]="type:string",
["parameter2"]="attr:string",
["parameter3"]="op:string",
["parameter4"]="v:int",
["parameter5"]="side:int"
} }
} }
local config = { local config = {
data=struct,count=6 data=struct,count=7
} }
return config return config

16
lua/app/config/task.lua
View File

@ -6,10 +6,10 @@ local task = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=17,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vw8=",
["num"]=10, ["num"]=1,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vw=="
} }
}, },
["icon"]="1" ["icon"]="1"
@ -21,10 +21,10 @@ local task = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=16,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Vw4=",
["num"]=10, ["num"]=1,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vw=="
} }
}, },
["icon"]="20" ["icon"]="20"

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

@ -13,6 +13,7 @@ local CONST_PATHS = {
HeroConst = "app/module/hero/hero_const", HeroConst = "app/module/hero/hero_const",
FormationConst = "app/module/formation/formation_const", FormationConst = "app/module/formation/formation_const",
ShopConst = "app/module/shop/shop_const", ShopConst = "app/module/shop/shop_const",
MailConst = "app/module/mail/mail_const",
} }
if EDITOR_MODE then if EDITOR_MODE then
@ -182,6 +183,7 @@ GConst.ATLAS_PATH = {
BOUNTY = "assets/arts/atlas/ui/bounty.asset", BOUNTY = "assets/arts/atlas/ui/bounty.asset",
UI_SETTING = "assets/arts/atlas/ui/setting.asset", UI_SETTING = "assets/arts/atlas/ui/setting.asset",
ICON_TASK = "assets/arts/atlas/icon/task.asset", ICON_TASK = "assets/arts/atlas/icon/task.asset",
SHOP = "assets/arts/atlas/ui/shop.asset",
} }
GConst.TOUCH_EVENT = { GConst.TOUCH_EVENT = {

30
lua/app/global/global_func.lua
View File

@ -1,6 +1,8 @@
local GFunc = {} local GFunc = {}
local EMPTY_TABLE = {} local EMPTY_TABLE = {}
local TEMP_LIST = {}
local TEMP_MAP = {}
local HASH_SEED = 31 local HASH_SEED = 31
local UINT_RANGE = 4294967296 local UINT_RANGE = 4294967296
local byte = string.byte local byte = string.byte
@ -578,7 +580,7 @@ function GFunc.showItemNotEnough(itemId)
end end
end end
function GFunc.checkCost(id, num, showToast, giftType) function GFunc.checkCost(id, num, showToast)
if num <= 0 then if num <= 0 then
return true return true
end end
@ -1647,6 +1649,32 @@ function GFunc.intToString(int)
return GConst.INT_TO_STRING[int] or tostring(int) return GConst.INT_TO_STRING[int] or tostring(int)
end end
function GFunc.getTempList()
for i = 1, #TEMP_LIST do
table.remove(TEMP_LIST)
end
return TEMP_LIST
end
function GFunc.recycleTempList()
for i = 1, #TEMP_LIST do
table.remove(TEMP_LIST)
end
end
function GFunc.getTempMap()
for k, v in pairs(TEMP_MAP) do
TEMP_MAP[k] = nil
end
return TEMP_MAP
end
function GFunc.recycleTempMap()
for k, v in pairs(TEMP_MAP) do
TEMP_MAP[k] = nil
end
end
--[[ --[[
设置tabLe只速 出现改写会抛出Lua error 设置tabLe只速 出现改写会抛出Lua error
用法locaL readOnlyCfg = GFunc.readOnlyTab(cfg) return readOnlyCfg 用法locaL readOnlyCfg = GFunc.readOnlyTab(cfg) return readOnlyCfg

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

@ -189,17 +189,36 @@ BattleConst.EFFECT_TYPE = {
COUNTERATTACK = 301, -- 反击 COUNTERATTACK = 301, -- 反击
} }
---- 特殊的伤害类型，其余都是buffname
BattleConst.SPECIAL_DAMAGE_OR_CURE_TYPE = {
ROUND_BEGIN_HEAL = "round_begin_heal",
KILL_MAX_ELEMENT_AND_HEAL = "kill_max_element_and_heal",
}
BattleConst.SKILL_RECORD_DATA_NAME = { BattleConst.SKILL_RECORD_DATA_NAME = {
HP_LOWER_THAN = 1 HP_LOWER_THAN = 1
} }
BattleConst.SKILL_CONDITION_TYPE = {
STATE = "state", -- 状态
ATTR = "attr", -- 属性
}
BattleConst.SKILL_CONDITION_REL_TYPE = {
AND = 1,
OR = 2,
}
BattleConst.PASSIVE_EVENT = { BattleConst.PASSIVE_EVENT = {
ON_UNIT_PREPARE_OVER = 2, -- 新单位出场时 ON_UNIT_PREPARE_OVER = 2, -- 新单位出场时
ON_UNI_ATTACK_START = 3, -- 攻击开始前 ON_UNI_ATTACK_START = 3, -- 攻击开始前
HP_LOWER_THAN = 4, -- 血量低于X% HP_LOWER_THAN = 4, -- 血量低于X%
USE_NORMAL_SKILL = 5, -- 使用普攻 USE_NORMAL_SKILL = 5, -- 使用普攻
ACTIVE_SKILL_HIT = 6, -- 主动技能命中 ACTIVE_SKILL_HIT = 6, -- 主动技能命中
ON_DEAD = 7, -- 死亡时 ON_ACTIVE_SKILL_BEFORE = 7, -- 主动技能释放前
ON_DEAD_BY_BURN = 8, -- 有敌人死于灼烧伤害时触发
ON_DEAD_BY_SKILL = 9, -- 有敌人死于技能时触发
ON_DEAD = 10, -- 死亡时
} }
local BUFF_NAME = { local BUFF_NAME = {
@ -377,6 +396,7 @@ BattleConst.GRID_EFFECT_TYPE = {
DIRECTION_ELIMINATION = 1, DIRECTION_ELIMINATION = 1,
CROSS_SPREAD = 2, CROSS_SPREAD = 2,
SELECT_COMMON_SKILL = 3, SELECT_COMMON_SKILL = 3,
REWARD_BOX = 4,
} }
BattleConst.GRID_EFFECT_TRIGGER_TYPE = { BattleConst.GRID_EFFECT_TRIGGER_TYPE = {
@ -674,6 +694,8 @@ BattleConst.SKILL_TYPE = {
RANDOM_KILL_ROW_OR_COLUMN = 8, RANDOM_KILL_ROW_OR_COLUMN = 8,
KILL_MAX_ELEMENT_AND_HEAL = 9, KILL_MAX_ELEMENT_AND_HEAL = 9,
KILL_ROW_AND_COLUMN = 10, KILL_ROW_AND_COLUMN = 10,
ADD_SKILL_ENERGY = 11,
CHANGE_ELEMENT_TYPE = 12,
} }
BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = { BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = {
@ -684,6 +706,8 @@ BattleConst.ATTACK_OVER_ACTIVE_SKILL_TYPE = {
[BattleConst.SKILL_TYPE.RANDOM_KILL_ROW_OR_COLUMN] = true, [BattleConst.SKILL_TYPE.RANDOM_KILL_ROW_OR_COLUMN] = true,
[BattleConst.SKILL_TYPE.KILL_MAX_ELEMENT_AND_HEAL] = true, [BattleConst.SKILL_TYPE.KILL_MAX_ELEMENT_AND_HEAL] = true,
[BattleConst.SKILL_TYPE.KILL_ROW_AND_COLUMN] = true, [BattleConst.SKILL_TYPE.KILL_ROW_AND_COLUMN] = true,
[BattleConst.SKILL_TYPE.ADD_SKILL_ENERGY] = true,
[BattleConst.SKILL_TYPE.CHANGE_ELEMENT_TYPE] = true,
} }
BattleConst.SKILL_METHOD_TYPE = { BattleConst.SKILL_METHOD_TYPE = {
@ -711,4 +735,15 @@ BattleConst.LINE_SFX = "assets/prefabs/effects/battle/sfx_piece_line_b01.prefab"
BattleConst.CHANGE_ELEMENT_SFX = "assets/prefabs/effects/battle/sfx_skill_b02.prefab" BattleConst.CHANGE_ELEMENT_SFX = "assets/prefabs/effects/battle/sfx_skill_b02.prefab"
BattleConst.LINK_SMOKE = "assets/prefabs/effects/battle/sfx_piece_smoke_b01.prefab" BattleConst.LINK_SMOKE = "assets/prefabs/effects/battle/sfx_piece_smoke_b01.prefab"
BattleConst.BATTLE_TASK_FIELD = {
SKILL_BOX_OPEN = "skill_box", -- 技能宝箱打开次数(神灯)
KILL_BOSS = "kills_boss", -- boss击杀数量
KILL_NORMAL_MONSTER = "kills_monster", -- 击杀小怪数量
ELIMINATION_COUNT = "clear_elements", -- 累计消除元素个数
LINK_COUNT_OVER_6 = "clear_6_combo", -- 6连消个数
LINK_COUNT_OVER_8 = "clear_8_combo", -- 8连消个数
COMBO_OVER_10 = "clear_10_hit", -- 10连击以上次数
BOARD_SKILL_RELEASE_COUNT = "skills_cast", -- 释放技能次数
}
return BattleConst return BattleConst

4
lua/app/module/battle/battle_manager.lua
View File

@ -14,8 +14,8 @@ function BattleManager:showPauseUI()
UIManager:showUI("app/ui/battle/battle_pause_ui") UIManager:showUI("app/ui/battle/battle_pause_ui")
end end
function BattleManager:showBattleResultUI(rewards, combatReport) function BattleManager:showBattleResultUI(rewards, combatReport, mysteryBoxIdx)
UIManager:showUI("app/ui/battle/battle_result_ui", {rewards = rewards, combatReport = combatReport}) UIManager:showUI("app/ui/battle/battle_result_ui", {rewards = rewards, combatReport = combatReport, mysteryBoxIdx = mysteryBoxIdx})
end end
function BattleManager:playBattle(battleType, params, returnFunc) function BattleManager:playBattle(battleType, params, returnFunc)

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

@ -2,6 +2,7 @@ local BattleConst = require "app/module/battle/battle_const"
local BattleHelper = require "app/module/battle/helper/battle_helper" local BattleHelper = require "app/module/battle/helper/battle_helper"
local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle" local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle"
local BATTLE_BOARD_SKILL_HANDLE = require "app/module/battle/skill/battle_board_skill_handle" local BATTLE_BOARD_SKILL_HANDLE = require "app/module/battle/skill/battle_board_skill_handle"
local BATTLE_SKILL_CONDITION_HANDLE = require "app/module/battle/helper/battle_skill_condition_handle"
local BattlePassive = require "app/module/battle/helper/battle_passive" local BattlePassive = require "app/module/battle/helper/battle_passive"
local BattleUnitComp = class("BattleUnitComp", LuaComponent) local BattleUnitComp = class("BattleUnitComp", LuaComponent)
@ -82,6 +83,8 @@ function BattleUnitComp:_initBase()
self.skillSlowDownScale = 1 -- 子弹时间减慢的倍率 self.skillSlowDownScale = 1 -- 子弹时间减慢的倍率
self.currAttackDuration = 0 self.currAttackDuration = 0
self.currAttackKeyTime = 0 self.currAttackKeyTime = 0
self.currAttackBlockIndex = 0 -- 多段伤害索引
self.validEffectIdx = {}
self.switchTime = 0 self.switchTime = 0
self.isPlayHurt = 0 self.isPlayHurt = 0
self.attackDurationMap = {} self.attackDurationMap = {}
@ -254,6 +257,30 @@ function BattleUnitComp:getAnimationKeyFrameTime(animationName)
return time return time
end end
function BattleUnitComp:getKeyFrameTime(skill, blockIndex, animationName)
self.validEffectIdx[1] = 1
self.validEffectIdx[2] = 1
if not skill then
return 0
end
self.currAttackBlockIndex = blockIndex
local time = skill:getEffectBlockTime()[blockIndex]
if not time then
if blockIndex == 1 then
time = self:getAnimationKeyFrameTime(animationName)
else
time = 0
end
else
local blockList = skill:getEffectBlock()
local beforeIndex = blockIndex - 1
self.validEffectIdx[1] = blockList[beforeIndex] or 1
self.validEffectIdx[2] = blockList[blockIndex] or 1
end
return time
end
function BattleUnitComp:getIsCentralizedAttack() function BattleUnitComp:getIsCentralizedAttack()
return self.team:getCentralizedAttack() return self.team:getCentralizedAttack()
end end
@ -335,6 +362,9 @@ function BattleUnitComp:useSkill(index, count, callback)
if self.isOutside then if self.isOutside then
self:playSwitchIn() self:playSwitchIn()
else else
if count <= 0 then
self:checkPassiveEvent(PASSIVE_EVENT.ON_ACTIVE_SKILL_BEFORE, self)
end
if not self:changeState(UNIT_STATE.SKILL_ATTACK) then if not self:changeState(UNIT_STATE.SKILL_ATTACK) then
self.actionOverCallback = nil self.actionOverCallback = nil
self.battleController:setIsPauseHpProgress(false) self.battleController:setIsPauseHpProgress(false)
@ -460,8 +490,6 @@ function BattleUnitComp:changeState(state)
self:enterAssistingAttackState() self:enterAssistingAttackState()
elseif state == UNIT_STATE.DEAD then elseif state == UNIT_STATE.DEAD then
self:enterDeadState() self:enterDeadState()
elseif state == UNIT_STATE.BORN then
self:enterBornState()
elseif state == UNIT_STATE.ENTER_BATTLEFIELD then elseif state == UNIT_STATE.ENTER_BATTLEFIELD then
self:enterEnterBattlefieldState() self:enterEnterBattlefieldState()
elseif state == UNIT_STATE.SWITCH_IN then elseif state == UNIT_STATE.SWITCH_IN then
@ -490,6 +518,7 @@ function BattleUnitComp:updateSwitchInState(dt)
if self.switchTime < 0 then if self.switchTime < 0 then
if self.actionOverCallback then if self.actionOverCallback then
if self.currActiveSkill then if self.currActiveSkill then
self:checkPassiveEvent(PASSIVE_EVENT.ON_ACTIVE_SKILL_BEFORE, self)
if not self:changeState(UNIT_STATE.SKILL_ATTACK) then if not self:changeState(UNIT_STATE.SKILL_ATTACK) then
local callback = self.actionOverCallback local callback = self.actionOverCallback
self.actionOverCallback = nil self.actionOverCallback = nil
@ -667,7 +696,7 @@ function BattleUnitComp:updateRecoverHpWaveState(dt)
if healNum < 0 then -- 治疗效果不能为负数 if healNum < 0 then -- 治疗效果不能为负数
healNum = 0 healNum = 0
end end
self:takeDamageOrCure(self, healNum, EFFECT_TYPE.HEAL, 0) self:takeDamageOrCure(self, healNum, EFFECT_TYPE.HEAL, 0, BattleConst.SPECIAL_DAMAGE_OR_CURE_TYPE.ROUND_BEGIN_HEAL)
if self.recoverHpCount <= 0 then if self.recoverHpCount <= 0 then
if self.finishRecoverHpCallback then if self.finishRecoverHpCallback then
local callback = self.finishRecoverHpCallback local callback = self.finishRecoverHpCallback
@ -700,7 +729,7 @@ function BattleUnitComp:enterAssistingAttackState()
skill:startUse() skill:startUse()
local attackName = skill:getSkillAttackName() local attackName = skill:getSkillAttackName()
self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackDuration = self:getAnimationDuration(attackName)
self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self.currAttackKeyTime = self:getKeyFrameTime(skill, 1, attackName)
self:playAnimation(attackName, false, false) self:playAnimation(attackName, false, false)
self:playSkillFx(skill) self:playSkillFx(skill)
self:initPosition() self:initPosition()
@ -723,9 +752,14 @@ function BattleUnitComp:updateAssistingAttackState(dt)
self:onAttackOver() self:onAttackOver()
else else
if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用 if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用
self.currAttackKeyTime = 0
local skill = self.unitEntity:getAssistingSkill() local skill = self.unitEntity:getAssistingSkill()
self:onSkillTakeEffect(skill) if skill then
local attackName = skill:getSkillAttackName()
self.currAttackKeyTime = self:getKeyFrameTime(skill, self.currAttackBlockIndex + 1, attackName)
else
self.currAttackKeyTime = 0
end
self:onSkillTakeEffect(skill, self.currAttackKeyTime <= 0, self.validEffectIdx)
end end
end end
end end
@ -768,7 +802,7 @@ function BattleUnitComp:enterSkillAttackState()
self:attackAndSpeedUp() self:attackAndSpeedUp()
end end
self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackDuration = self:getAnimationDuration(attackName)
self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self.currAttackKeyTime = self:getKeyFrameTime(skill, 1, attackName)
self:playAnimation(attackName, false, false) self:playAnimation(attackName, false, false)
self:playSkillFx(skill) self:playSkillFx(skill)
end end
@ -822,6 +856,7 @@ function BattleUnitComp:updateSkillAttack(dt)
else else
self.currActiveSkill:startUse() self.currActiveSkill:startUse()
self:doNextSkillAttack() self:doNextSkillAttack()
self:checkPassiveEvent(PASSIVE_EVENT.ON_ACTIVE_SKILL_BEFORE, self)
end end
else -- 继续普攻 else -- 继续普攻
self:doNextNormalAttack() self:doNextNormalAttack()
@ -849,6 +884,11 @@ function BattleUnitComp:updateSkillAttack(dt)
else else
self:onAttackOver() self:onAttackOver()
end end
local target = self.battleController:getOtherSideMainUnit(self.side)
if target and target.unitEntity:getIsDead() then
self:checkPassiveEvent(PASSIVE_EVENT.ON_DEAD_BY_SKILL, self)
end
return return
else else
self.currActiveSkill = currActiveSkill self.currActiveSkill = currActiveSkill
@ -857,23 +897,34 @@ function BattleUnitComp:updateSkillAttack(dt)
end end
else else
if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用 if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用
self.currAttackKeyTime = 0
if self.normalSkillCount > 0 then if self.normalSkillCount > 0 then
if self.normalSkillCount == 1 and self.currActiveSkill == nil then -- 最后一次攻击 local skill = self.unitEntity:getNormalSkill()
if skill then
local attackName = skill:getSkillAttackName()
self.currAttackKeyTime = self:getKeyFrameTime(skill, self.currAttackBlockIndex + 1, attackName)
else
self.currAttackKeyTime = 0
end
local isFinalBlock = self.currAttackKeyTime <= 0
if self.normalSkillCount == 1 and self.currActiveSkill == nil and isFinalBlock then -- 最后一次攻击
self.team:setCentralizedAttack(false) self.team:setCentralizedAttack(false)
end end
local skill = self.unitEntity:getNormalSkill() self:onSkillTakeEffect(skill, self.currAttackKeyTime <= 0, self.validEffectIdx)
self:onSkillTakeEffect(skill) if self.normalSkillCount == 1 and self.currActiveSkill == nil and isFinalBlock then -- 最后一次攻击
if self.normalSkillCount == 1 and self.currActiveSkill == nil then -- 最后一次攻击
self.battleController:setIsPauseHpProgress(false) self.battleController:setIsPauseHpProgress(false)
end end
else else
local attackName = self.currActiveSkill:getSkillAttackName()
self.currAttackKeyTime = self:getKeyFrameTime(self.currActiveSkill, self.currAttackBlockIndex + 1, attackName)
local isFinalBlock = self.currAttackKeyTime <= 0
local isHaveNextAttack = self:getIsHaveNextAvailableActiveSkill() local isHaveNextAttack = self:getIsHaveNextAvailableActiveSkill()
if not isHaveNextAttack then if not isHaveNextAttack and isFinalBlock then
self.team:setCentralizedAttack(false) self.team:setCentralizedAttack(false)
end end
self:onSkillTakeEffect(self.currActiveSkill)
if not isHaveNextAttack then self:onSkillTakeEffect(self.currActiveSkill, isFinalBlock, self.validEffectIdx)
if not isHaveNextAttack and isFinalBlock then
self.battleController:setIsPauseHpProgress(false) self.battleController:setIsPauseHpProgress(false)
end end
end end
@ -944,7 +995,7 @@ function BattleUnitComp:doNextSkillAttack()
end end
local attackName = self.currActiveSkill:getSkillAttackName() local attackName = self.currActiveSkill:getSkillAttackName()
self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackDuration = self:getAnimationDuration(attackName)
self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self.currAttackKeyTime = self:getKeyFrameTime(self.currActiveSkill, 1, attackName)
self:playAnimation(attackName, false, false) self:playAnimation(attackName, false, false)
self:playSkillFx(self.currActiveSkill) self:playSkillFx(self.currActiveSkill)
self.battleController:resetTimeSpeed() self.battleController:resetTimeSpeed()
@ -957,7 +1008,7 @@ function BattleUnitComp:doNextNormalAttack()
skill:startUse() skill:startUse()
local attackName = skill:getSkillAttackName() local attackName = skill:getSkillAttackName()
self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackDuration = self:getAnimationDuration(attackName)
self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self.currAttackKeyTime = self:getKeyFrameTime(skill, 1, attackName)
self:playAnimation(attackName, false, false) self:playAnimation(attackName, false, false)
self:playSkillFx(skill) self:playSkillFx(skill)
self:attackAndSpeedUp() self:attackAndSpeedUp()
@ -973,7 +1024,7 @@ function BattleUnitComp:doNextAttack()
attackName = skill:getSkillAttackName() attackName = skill:getSkillAttackName()
if attackName then if attackName then
self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackDuration = self:getAnimationDuration(attackName)
self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self.currAttackKeyTime = self:getKeyFrameTime(skill, 1, attackName)
self:playAnimation(attackName, false, false) self:playAnimation(attackName, false, false)
self:playSkillFx(skill) self:playSkillFx(skill)
self:attackAndSpeedUp() self:attackAndSpeedUp()
@ -993,7 +1044,7 @@ function BattleUnitComp:doNextAttack()
attackName = self.currActiveSkill:getSkillAttackName() attackName = self.currActiveSkill:getSkillAttackName()
if attackName then if attackName then
self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackDuration = self:getAnimationDuration(attackName)
self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self.currAttackKeyTime = self:getKeyFrameTime(self.currActiveSkill, 1, attackName)
self:playAnimation(attackName, false, false) self:playAnimation(attackName, false, false)
self:playSkillFx(self.currActiveSkill) self:playSkillFx(self.currActiveSkill)
self.battleController:resetTimeSpeed() self.battleController:resetTimeSpeed()
@ -1026,7 +1077,7 @@ function BattleUnitComp:enterNormalAttackState()
self.isMove = false self.isMove = false
local attackName = skill:getSkillAttackName() local attackName = skill:getSkillAttackName()
self.currAttackDuration = self:getAnimationDuration(attackName) self.currAttackDuration = self:getAnimationDuration(attackName)
self.currAttackKeyTime = self:getAnimationKeyFrameTime(attackName) self.currAttackKeyTime = self:getKeyFrameTime(skill, 1, attackName)
self:playAnimation(attackName, false, false) self:playAnimation(attackName, false, false)
self:playSkillFx(skill) self:playSkillFx(skill)
self:attackAndSpeedUp() self:attackAndSpeedUp()
@ -1069,13 +1120,20 @@ function BattleUnitComp:updateNormalAttack(dt)
end end
else else
if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用 if self.currAttackKeyTime > 0 and self.attackTime >= self.currAttackKeyTime then -- 到达关键后使用
local skill = self.unitEntity:getNormalSkill()
if skill then
local attackName = skill:getSkillAttackName()
self.currAttackKeyTime = self:getKeyFrameTime(skill, self.currAttackBlockIndex + 1, attackName)
else
self.currAttackKeyTime = 0 self.currAttackKeyTime = 0
if self.normalSkillCount == 1 then -- 如果是最后一次攻击，那么敌人受到这次攻击可以开始嗝屁了 end
local isFinalBlock = self.currAttackKeyTime <= 0
if self.normalSkillCount == 1 and isFinalBlock then -- 如果是最后一次攻击，那么敌人受到这次攻击可以开始嗝屁了
self.team:setCentralizedAttack(false) self.team:setCentralizedAttack(false)
end end
local skill = self.unitEntity:getNormalSkill() self:onSkillTakeEffect(skill, isFinalBlock, self.validEffectIdx)
self:onSkillTakeEffect(skill) if self.normalSkillCount == 1 and isFinalBlock then -- 如果是最后一次攻击，那么可以开始跑血条了
if self.normalSkillCount == 1 then -- 如果是最后一次攻击，那么可以开始跑血条了
self.battleController:setIsPauseHpProgress(false) self.battleController:setIsPauseHpProgress(false)
end end
end end
@ -1093,6 +1151,10 @@ function BattleUnitComp:addBuff(buffEffect)
return self.team:addBuff(buffEffect) return self.team:addBuff(buffEffect)
end end
function BattleUnitComp:getBuffCountByName(buffName)
return self.team:getBuffCountByName(buffName)
end
function BattleUnitComp:updateBuffState(buff, num) function BattleUnitComp:updateBuffState(buff, num)
self.team:updateBuffState(buff, num) self.team:updateBuffState(buff, num)
end end
@ -1117,11 +1179,17 @@ function BattleUnitComp:popCacheBuffByDecr(buffDecr)
self.team:popCacheBuffByDecr(buffDecr) self.team:popCacheBuffByDecr(buffDecr)
end end
function BattleUnitComp:onSkillTakeEffect(skill) function BattleUnitComp:onSkillTakeEffect(skill, isFinalBlock, validEffectIdx)
if isFinalBlock == nil then
isFinalBlock = true
end
if isFinalBlock then
skill:endUse() skill:endUse()
if skill:isAttackOverActive() then if skill:isAttackOverActive() then
BATTLE_BOARD_SKILL_HANDLE.activeAttackOverSkill(self, skill, self.battleController) BATTLE_BOARD_SKILL_HANDLE.activeAttackOverSkill(self, skill, self.battleController)
end end
end
local effectList = skill:getEffectList() local effectList = skill:getEffectList()
if effectList == nil then if effectList == nil then
return return
@ -1129,6 +1197,9 @@ function BattleUnitComp:onSkillTakeEffect(skill)
if #effectList == 0 then if #effectList == 0 then
return return
end end
if not validEffectIdx then
validEffectIdx = {1, 1}
end
local targetType = skill:getTargetType() local targetType = skill:getTargetType()
local target local target
if targetType == 1 then -- 自己 if targetType == 1 then -- 自己
@ -1147,19 +1218,26 @@ function BattleUnitComp:onSkillTakeEffect(skill)
local succ = false local succ = false
for k, effect in ipairs(effectList) do for k, effect in ipairs(effectList) do
if k >= validEffectIdx[1] and k <= validEffectIdx[2] then
if self:judgeSkillEffectCondition(skill, k) then
if self:takeEffect(effect, target) then if self:takeEffect(effect, target) then
succ = true succ = true
end end
end end
end
end
if succ then if succ then
if skill:getIsHurtType() then if skill:getIsHurtType() then
self.team:addCombo() self.team:addCombo()
end end
if isFinalBlock then
if skill:getIsNormalType() then -- 普攻攻击成功的话 if skill:getIsNormalType() then -- 普攻攻击成功的话
self:checkPassiveEvent(PASSIVE_EVENT.USE_NORMAL_SKILL, target) self:checkPassiveEvent(PASSIVE_EVENT.USE_NORMAL_SKILL, target)
elseif skill:getIsActiveType() then elseif skill:getIsActiveType() then
self:checkPassiveEvent(PASSIVE_EVENT.ACTIVE_SKILL_HIT, target) self:checkPassiveEvent(PASSIVE_EVENT.ACTIVE_SKILL_HIT, target)
end end
end
local shakeType = skill:getShakeType() local shakeType = skill:getShakeType()
if shakeType then if shakeType then
local shakeTime = skill:getShakeTime() or 0 local shakeTime = skill:getShakeTime() or 0
@ -1174,6 +1252,17 @@ function BattleUnitComp:onSkillTakeEffect(skill)
end end
end end
function BattleUnitComp:judgeSkillEffectCondition(skill, index)
if not skill then
return true
end
local buffConditions = skill:getBuffCondition(index)
local conditionRel = skill:getBuffConditionRel(index)
return BATTLE_SKILL_CONDITION_HANDLE.judgeSkillEffectCondition(buffConditions, conditionRel, self.battleController)
end
function BattleUnitComp:takeEffect(buff, target) function BattleUnitComp:takeEffect(buff, target)
local ratio = buff:getRatio() local ratio = buff:getRatio()
if ratio < DEFAULT_FACTOR then if ratio < DEFAULT_FACTOR then
@ -1269,7 +1358,7 @@ function BattleUnitComp:removeEffect(buff, target)
end end
end end
function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus) function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, damageOrCureType)
if self:getIsClear() then if self:getIsClear() then
return 0 return 0
end end
@ -1327,16 +1416,16 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus)
end end
if effectType == EFFECT_TYPE.DIRECT then if effectType == EFFECT_TYPE.DIRECT then
if hp > 0 and self.unitEntity:getShieldRebound() then -- 伤害反弹 if hp > 0 and self.unitEntity:getShieldRebound() then -- 伤害反弹
atker:takeDamageOrCure(self, num*self.unitEntity:getShieldRebound() // DEFAULT_FACTOR, EFFECT_TYPE.REBOUND, 0) atker:takeDamageOrCure(self, num*self.unitEntity:getShieldRebound() // DEFAULT_FACTOR, EFFECT_TYPE.REBOUND, 0, BattleConst.BUFF_NAME.SHIELD_REBOUND_200)
end end
if self.unitEntity:getBeSucked() > 0 then -- 吸血 if self.unitEntity:getBeSucked() > 0 then -- 吸血
atker:takeDamageOrCure(self, -num*self.unitEntity:getBeSucked() // DEFAULT_FACTOR, EFFECT_TYPE.HEAL, 0) atker:takeDamageOrCure(self, -num*self.unitEntity:getBeSucked() // DEFAULT_FACTOR, EFFECT_TYPE.HEAL, 0, BattleConst.ATTR_NAME.BE_SUCKED)
end end
if self.unitEntity:getIsLethargy() then -- 移除昏睡 if self.unitEntity:getIsLethargy() then -- 移除昏睡
self:removeBuffByName(BattleConst.BUFF_NAME.LETHARGY) self:removeBuffByName(BattleConst.BUFF_NAME.LETHARGY)
end end
if self.unitEntity:getThorns() > 0 then -- 反伤 if self.unitEntity:getThorns() > 0 then -- 反伤
atker:takeDamageOrCure(self, num*self.unitEntity:getThorns() // DEFAULT_FACTOR, EFFECT_TYPE.REBOUND, 0) atker:takeDamageOrCure(self, num*self.unitEntity:getThorns() // DEFAULT_FACTOR, EFFECT_TYPE.REBOUND, 0, BattleConst.BUFF_NAME.THORNS)
end end
if self.unitEntity:getCounterAttack() > 0 then -- 触发反击 if self.unitEntity:getCounterAttack() > 0 then -- 触发反击
local counterattack = self.unitEntity:getCounterAttack() local counterattack = self.unitEntity:getCounterAttack()
@ -1357,10 +1446,15 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus)
else else
if self.unitEntity:getIsDead() then if self.unitEntity:getIsDead() then
self:changeState(UNIT_STATE.DEAD) self:changeState(UNIT_STATE.DEAD)
if damageOrCureType == BattleConst.BUFF_NAME.BURN then
local target = self.battleController:getOtherSideMainUnit(self.side)
target:checkPassiveEvent(BattleConst.PASSIVE_EVENT.ON_DEAD_BY_BURN, target)
end
elseif damage < 0 and self.currState == UNIT_STATE.IDLE then elseif damage < 0 and self.currState == UNIT_STATE.IDLE then
self:playHurt() self:playHurt()
end end
end end
if hp > 0 then if hp > 0 then
self.team:checkPassiveEvent(PASSIVE_EVENT.HP_LOWER_THAN, atker, hpPercent) self.team:checkPassiveEvent(PASSIVE_EVENT.HP_LOWER_THAN, atker, hpPercent)
else else

244
lua/app/module/battle/controller/battle_controller.lua
View File

@ -9,6 +9,7 @@ local BattleController = class("BattleController")
local BATTLE_BOARD_SKILL_HANDLE = require "app/module/battle/skill/battle_board_skill_handle" local BATTLE_BOARD_SKILL_HANDLE = require "app/module/battle/skill/battle_board_skill_handle"
local BATTLE_ROGUE_SKILL_HANDLE = require "app/module/battle/skill/battle_rogue_skill_handle" local BATTLE_ROGUE_SKILL_HANDLE = require "app/module/battle/skill/battle_rogue_skill_handle"
local BATTLE_GRID_EFFECT_HANDLE = require "app/module/battle/skill/battle_grid_effect_handle" local BATTLE_GRID_EFFECT_HANDLE = require "app/module/battle/skill/battle_grid_effect_handle"
local BATTLE_INSTRUCTIONS_HELPER = require "app/module/battle/helper/battle_instructions_helper"
local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle" local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle"
local ELIMINATION_TOUCH_EVENT = GConst.ELIMINATION_TOUCH_EVENT local ELIMINATION_TOUCH_EVENT = GConst.ELIMINATION_TOUCH_EVENT
@ -102,7 +103,6 @@ function BattleController:onLinkChange()
local sequence = self.battleData:getGridSequence() local sequence = self.battleData:getGridSequence()
local mainElementType local mainElementType
local boomGridIds = {}
for index, info in ipairs(sequence) do for index, info in ipairs(sequence) do
local entity = self.battleData:getGridEntity(info.posId) local entity = self.battleData:getGridEntity(info.posId)
@ -111,10 +111,6 @@ function BattleController:onLinkChange()
if not skillId then if not skillId then
mainElementType = entity:getElementType() mainElementType = entity:getElementType()
break break
else
local skillEntity = self.battleData:getSkillEntityBySkillId(skillId)
mainElementType = entity:getElementType(skillEntity)
break
end end
end end
end end
@ -203,6 +199,7 @@ function BattleController:init(params)
self.eliminateCount = 0 self.eliminateCount = 0
self.eliminateTotalCount = 0 self.eliminateTotalCount = 0
self.realTime = 0 self.realTime = 0
self.taskProgress = {}
self.chapterId = self:getChapterId() self.chapterId = self:getChapterId()
self.waveIndex = 0 self.waveIndex = 0
@ -211,6 +208,8 @@ function BattleController:init(params)
self.roundStep = BattleConst.BATTLE_ROUND_STEP.WAIT_BEGIN self.roundStep = BattleConst.BATTLE_ROUND_STEP.WAIT_BEGIN
self.effectTexts = {} self.effectTexts = {}
self.instructions = {} self.instructions = {}
self.gotMysteryBoxIndexs = {}
self.showMysteryBoxIndexs = {}
self.delayEffectTextList = {} self.delayEffectTextList = {}
self.delayEffectTextCount = 0 self.delayEffectTextCount = 0
self.time = 0 self.time = 0
@ -417,6 +416,14 @@ function BattleController:enterNextWave()
return return
end end
if self.waveIndex ~= 0 then
if self.isBossWave then
self:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.KILL_BOSS, 1)
else
self:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.KILL_NORMAL_MONSTER, 1)
end
end
if self.waveIndex >= self.maxWaveIndex then if self.waveIndex >= self.maxWaveIndex then
self.victory = true self.victory = true
self:postWaveOver(false) self:postWaveOver(false)
@ -871,6 +878,7 @@ function BattleController:onLinkOver()
local skillEntity local skillEntity
if skillId then if skillId then
skillEntity = self.battleData:getSkillEntityBySkillId(skillId) skillEntity = self.battleData:getSkillEntityBySkillId(skillId)
self:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.BOARD_SKILL_RELEASE_COUNT, 1)
end end
local aniSequence, influenceElementTypeMap, lineCount, elementTypeMap, linkElementType, effectGridMap = self:calculateCurElimination() local aniSequence, influenceElementTypeMap, lineCount, elementTypeMap, linkElementType, effectGridMap = self:calculateCurElimination()
@ -931,10 +939,10 @@ function BattleController:calculateCurElimination(onlyCheck)
local entity = gridEntities[info.posId] local entity = gridEntities[info.posId]
local elementType = entity:getElementType() local elementType = entity:getElementType()
if not info.noAni and info.isIdle then if not info.noAni and info.isIdle then
if not info.isSkill then
elementTypeMap[elementType] = (elementTypeMap[elementType] or 0) + 1 elementTypeMap[elementType] = (elementTypeMap[elementType] or 0) + 1
if boomGridIds[info.posId] and boomGridIds[info.posId][GRID_BREAK_CONDITION.LINE] then if boomGridIds[info.posId] and boomGridIds[info.posId][GRID_BREAK_CONDITION.LINE] then
lineCount = lineCount + 1 lineCount = lineCount + 1
if not info.isSkill then
linkElementType = elementType linkElementType = elementType
end end
end end
@ -1003,6 +1011,12 @@ function BattleController:dealGridBreak(posId, condition, time, breakedMap, sequ
end end
end end
end end
if entity:getBreakFlyToCharacter() then
aniUnit.breakFlyToCharacter = true
aniUnit.noAni = false
aniUnit.overCallback = aniUnit.callback
aniUnit.callback = nil
end
end end
return isIdle return isIdle
@ -1122,9 +1136,25 @@ function BattleController:fillBoard(isRoundBeginCheck)
end end
function BattleController:onFillBoardOver(isRoundBeginCheck) function BattleController:onFillBoardOver(isRoundBeginCheck)
if not isRoundBeginCheck and self.battleData:useCommonSelectSkillCount() then self.battleUI:enableUITouch()
if not isRoundBeginCheck then -- 检查一些表现
if self.showMysteryBoxIndexs[1] then -- 检查宝箱
local index = table.remove(self.showMysteryBoxIndexs, 1)
local boardList, _, mysteryBoxIndexMap = self:getInitBoard()
local rewards = mysteryBoxIndexMap[index]
ModuleManager.TipsManager:showRewardsTips(rewards, nil, nil, function()
self:onFillBoardOver()
end)
return
end
if self.battleData:useCommonSelectSkillCount() then -- 检查神灯
self:tryShowSelectSkillComp(false, true) self:tryShowSelectSkillComp(false, true)
else return
end
end
if self.onFillBoardOverCallback then if self.onFillBoardOverCallback then
self.onFillBoardOverCallback() self.onFillBoardOverCallback()
end end
@ -1132,176 +1162,20 @@ function BattleController:onFillBoardOver(isRoundBeginCheck)
if isRoundBeginCheck then if isRoundBeginCheck then
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BOARD_FILL_OVER) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BOARD_FILL_OVER)
self:popBoardCacheSkill(function() self:popBoardCacheSkill(function()
self:generateSkill(function()
self:enterElimination(true) self:enterElimination(true)
end) end)
end)
else else
self:generateSkill(function() self:generateSkill(function()
self.battleUI:refreshSkill() self.battleUI:refreshSkill()
self:enterBattleStep() self:enterBattleStep()
end) end)
end end
end
self.battleUI:enableUITouch()
end end
function BattleController:generateInstructions(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap) function BattleController:generateInstructions(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap)
local elementTypeCount = 0 self.instructions = BATTLE_INSTRUCTIONS_HELPER.generateInstructions(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap, self)
-- local assistingList = nil
---- 援助
for element, count in pairs(elementTypeMap) do
-- if element == elementType then
elementTypeCount = elementTypeCount + count
-- else
-- if assistingList == nil then
-- assistingList = {}
-- end
-- local obj = {
-- count = count,
-- skillMatch = element,
-- }
-- table.insert(assistingList, obj)
-- end
end
---- 技能
if skillEntity then
if elementType == skillEntity:getPosition() then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL,
skillMatch = elementType,
count = elementTypeCount,
})
else
if skillEntity:getEffect() ~= nil then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL,
skillMatch = skillEntity:getPosition(),
count = 0,
})
end
if elementTypeCount > 0 then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK,
skillMatch = elementType,
count = elementTypeCount,
})
end
end
else
---- 普攻
if elementTypeCount > 0 then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK,
skillMatch = elementType,
count = elementTypeCount,
})
end
end
-- if assistingList then
-- table.insert(self.instructions, {
-- name = BattleConst.INSTRUCTION_NAME.ASSISTING,
-- assistingList = assistingList,
-- })
-- end
---- 加buff
if skillEntity then
local eliminateEffects = skillEntity:getEliminateEffects(self)
if eliminateEffects then
local effectList
for _, buffEntity in ipairs(eliminateEffects) do
if not effectList then
effectList = {}
end
table.insert(effectList, buffEntity)
end
if effectList then
local unit = {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
}
table.insert(self.instructions, unit)
end
end
if skillEntity:getLinkEffects() and elementType then
local effectList
for type, buffEntities in pairs(skillEntity:getLinkEffects()) do
local buffEntity = buffEntities[elementType]
if buffEntity then
if not effectList then
effectList = {}
end
table.insert(effectList, buffEntity)
end
end
if effectList then
local unit = {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
}
table.insert(self.instructions, unit)
end
end
if skillEntity:getInInfluenceEffects() and influenceElementTypeMap then
for influenceElementType , _ in pairs(influenceElementTypeMap) do
local effectList
for type, buffEntities in pairs(skillEntity:getInInfluenceEffects()) do
local buffEntity = buffEntities[influenceElementType]
if buffEntity then
if not effectList then
effectList = {}
end
table.insert(effectList, buffEntity)
end
end
if effectList then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
})
end
end
end
if skillEntity:getElementCountEffect() and elementType then
local effectList
for type, buffEntities in pairs(skillEntity:getElementCountEffect()) do
local originBuffEntity = buffEntities.origin
local useBuffEntity = buffEntities.use
if not effectList then
effectList = {}
end
local newNum = originBuffEntity:getEffectNum() * lineCount
useBuffEntity:setEffectNum(newNum)
table.insert(effectList, useBuffEntity)
end
if effectList then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
})
end
end
--
if skillEntity:getSkillAttackBeforeEffects() and elementType then
local effectList
for type, buffEntity in pairs(skillEntity:getSkillAttackBeforeEffects()) do
if not effectList then
effectList = {}
end
table.insert(effectList, buffEntity)
end
if effectList then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
})
end
end
end
end end
function BattleController:exeInstructions(callback) function BattleController:exeInstructions(callback)
@ -1325,7 +1199,7 @@ function BattleController:exeInstructions(callback)
end end
function BattleController:generateBoard(isFirst) function BattleController:generateBoard(isFirst)
local boardList, _ = self:getInitBoard() local boardList, _, mysteryBoxIndexMap = self:getInitBoard()
if self.curBoardIndex and self.curBoardIndex >= #boardList then if self.curBoardIndex and self.curBoardIndex >= #boardList then
return return
end end
@ -1334,8 +1208,13 @@ function BattleController:generateBoard(isFirst)
return return
end end
self.curBoardIndex = (self.curBoardIndex or 0) + 1 self.curBoardIndex = (self.curBoardIndex or 0) + 1
local board = boardList[self.curBoardIndex] local board = boardList[self.curBoardIndex].board
local mysteryBoard = boardList[self.curBoardIndex].mysteryBoard
if mysteryBoard and mysteryBoxIndexMap and mysteryBoxIndexMap[self.curBoardIndex] then
board = mysteryBoard
end
self.battleUI:switchBoard(function() self.battleUI:switchBoard(function()
self.battleData:refreshBoard(board, self:getBlockIcon()) self.battleData:refreshBoard(board, self:getBlockIcon())
self.battleUI:initGridCell() self.battleUI:initGridCell()
@ -1344,6 +1223,11 @@ function BattleController:generateBoard(isFirst)
end, isFirst) end, isFirst)
end end
function BattleController:onGotMysteryBoxIndexs()
self.gotMysteryBoxIndexs[self.curBoardIndex] = true
table.insert(self.showMysteryBoxIndexs, self.curBoardIndex)
end
function BattleController:putBoardCacheSkill(callback) function BattleController:putBoardCacheSkill(callback)
if not self.battleUI then if not self.battleUI then
return return
@ -1763,7 +1647,8 @@ function BattleController:getRandomSkillList(getCount, onlyCommonSkill)
for _, skillId in ipairs(list) do for _, skillId in ipairs(list) do
local skillCfg = cfg[skillId] local skillCfg = cfg[skillId]
if skillCfg and (not skillCfg.limit_times or self.battleData:getSkillCount(skillId) < skillCfg.limit_times) then if skillCfg and (not skillCfg.limit_times or self.battleData:getSkillCount(skillId) < skillCfg.limit_times) then
if not map[skillId] then
if not map[skillId] and (not skillCfg.unlock or self.battleData:getSkillCount(skillCfg.unlock) > 0) then
table.insert(newSkillPool, skillId) table.insert(newSkillPool, skillId)
table.insert(skillWeight, skillCfg.weight) table.insert(skillWeight, skillCfg.weight)
count = count + 1 count = count + 1
@ -2437,6 +2322,17 @@ function BattleController:addBattleExp(exp)
self.battleData:addExp(exp) self.battleData:addExp(exp)
end end
function BattleController:addTaskProgress(fieldName, count)
if not count then
return
end
self.taskProgress[fieldName] = (self.taskProgress[fieldName] or 0) + count
end
function BattleController:getTaskProgress()
return self.taskProgress
end
function BattleController:_tick(dt) function BattleController:_tick(dt)
self.realTime = self.realTime + dt self.realTime = self.realTime + dt
if self.isPause then if self.isPause then
@ -2565,12 +2461,12 @@ local function _addCurRoundAttr(self, instruction, callback)
local mainComp = self:getOtherSideMainUnit(BattleConst.SIDE_DEF) local mainComp = self:getOtherSideMainUnit(BattleConst.SIDE_DEF)
for _, effect in ipairs(instruction.effectList) do for _, effect in ipairs(instruction.effectList) do
local target local target
if effect:getTartgetSide() == BattleConst.SIDE_DEF then if effect:getTargetSide() == BattleConst.SIDE_DEF then
target = defComp target = defComp
elseif effect:getTartgetSide() == BattleConst.SIDE_ATK then elseif effect:getTargetSide() == BattleConst.SIDE_ATK then
target = mainComp target = mainComp
else else
local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[effect:getTartgetSide()] local matchType = BattleConst.SIDE_OBJ_TO_MATCH_TYPE[effect:getTargetSide()]
if matchType then if matchType then
target = self.atkTeam:getUnitComp()[matchType] target = self.atkTeam:getUnitComp()[matchType]
end end
@ -2593,7 +2489,7 @@ local function _generalAttack(self, instruction, callback)
end end
local function _playSkill(self, instruction, callback) local function _playSkill(self, instruction, callback)
self.atkTeam:useSkill(instruction.skillMatch, instruction.count, #self.instructions == 0, callback) self.atkTeam:useSkill(instruction.skillMatch, instruction.count, #self.instructions == 0, BattleConst.EFFECT_TYPE.DIRECT, callback)
end end
BattleController._doInstruction = { BattleController._doInstruction = {

16
lua/app/module/battle/controller/battle_controller_stage.lua
View File

@ -91,18 +91,28 @@ function BattleControllerStage:getInitBoard()
if not self.boradList then if not self.boradList then
self.boradList = {} self.boradList = {}
self.fixedRandomGrid = {} self.fixedRandomGrid = {}
self.mysteryBoxIndexMap = {}
local config = ConfigManager:getConfig("chapter")[self.chapterId] local config = ConfigManager:getConfig("chapter")[self.chapterId]
local boardCfg = ConfigManager:getConfig("chapter_board") local boardCfg = ConfigManager:getConfig("chapter_board")
for _, boardId in ipairs(config.board) do for _, boardId in ipairs(config.board) do
local cfg = boardCfg[boardId] local cfg = boardCfg[boardId]
if cfg then if cfg then
table.insert(self.boradList, GFunc.getTable(cfg.board)) table.insert(self.boradList, {board = GFunc.getTable(cfg.board), mysteryBoard = GFunc.getTable(cfg.mystery_box_board)})
table.insert(self.fixedRandomGrid, GFunc.getTable(cfg.control_element)) table.insert(self.fixedRandomGrid, GFunc.getTable(cfg.control_element))
end end
end end
if config.mystery_box and config.mystery_box_reward then
for i, index in ipairs(config.mystery_box) do
if not DataManager.ChapterData:getChapterMysteryBoxIsGot(self.chapterId, index) then
self.mysteryBoxIndexMap[index] = config.mystery_box_reward[i]
end
end
end
end end
return self.boradList, self.fixedRandomGrid return self.boradList, self.fixedRandomGrid, self.mysteryBoxIndexMap
end end
function BattleControllerStage:getSealElementType() function BattleControllerStage:getSealElementType()
@ -170,7 +180,7 @@ function BattleControllerStage:controllBattleEnd()
if not self.victory then if not self.victory then
self.combatReport.wave = self.combatReport.wave - 1 self.combatReport.wave = self.combatReport.wave - 1
end end
ModuleManager.ChapterManager:endFight(self.chapterId, self.combatReport) ModuleManager.ChapterManager:endFight(self.chapterId, self.combatReport, self.gotMysteryBoxIndexs, self.taskProgress)
end end
function BattleController:postWaveOver(atkDead, isQuit) function BattleController:postWaveOver(atkDead, isQuit)

8
lua/app/module/battle/helper/battle_buff_handle.lua
View File

@ -18,7 +18,7 @@ local function _doDotWork(unitComp, buffEffect, buff)
else else
damage = -damage damage = -damage
end end
unitComp:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.DOT, hurtStatus) unitComp:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.DOT, hurtStatus, buff:getName())
end end
local function _doHotWork(unitComp, buffEffect, buff) local function _doHotWork(unitComp, buffEffect, buff)
@ -26,7 +26,7 @@ local function _doHotWork(unitComp, buffEffect, buff)
if cure < 0 then -- 加血不能是负数 if cure < 0 then -- 加血不能是负数
cure = 0 cure = 0
end end
unitComp:takeDamageOrCure(buffEffect.sender, cure, EFFECT_TYPE.HOT, hurtStatus) unitComp:takeDamageOrCure(buffEffect.sender, cure, EFFECT_TYPE.HOT, hurtStatus, buff:getName())
end end
function BattleBuffHandle.doBuffWork(unitComp, buffEffect) function BattleBuffHandle.doBuffWork(unitComp, buffEffect)
@ -92,7 +92,7 @@ local function _takeEffectDirectHurt(unitComp, buff, target, buffEffect)
else else
damage = -damage damage = -damage
end end
target:takeDamageOrCure(unitComp, damage, EFFECT_TYPE.DIRECT, hurtStatus) target:takeDamageOrCure(unitComp, damage, EFFECT_TYPE.DIRECT, hurtStatus, buff:getName())
return damage return damage
end end
@ -105,7 +105,7 @@ local function _takeEffectDirectCure(unitComp, buff, target, buffEffect)
if cure < 0 then -- 加血不能是负数 if cure < 0 then -- 加血不能是负数
cure = 0 cure = 0
end end
target:takeDamageOrCure(unitComp, cure, EFFECT_TYPE.HEAL, hurtStatus) target:takeDamageOrCure(unitComp, cure, EFFECT_TYPE.HEAL, hurtStatus, buff:getName())
return cure return cure
end end

2
lua/app/module/battle/helper/battle_buff_special.lua
View File

@ -43,7 +43,7 @@ local function _bleedWork(unitComp, buffEffect, buff)
else else
damage = -damage damage = -damage
end end
unitComp:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.DOT, hurtStatus) unitComp:takeDamageOrCure(buffEffect.sender, damage, EFFECT_TYPE.DOT, hurtStatus, buff:getName())
return 1 return 1
end end

262
lua/app/module/battle/helper/battle_instructions_helper.lua Normal file
View File

@ -0,0 +1,262 @@
local BattleConst = GConst.BattleConst
local BattleInstructionsHelper = {}
BattleInstructionsHelper._generateAttackInstructions = function(instructions, skillEntity, elementType, elementTypeCount)
if skillEntity then
if elementType == skillEntity:getPosition() then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL,
skillMatch = elementType,
count = elementTypeCount,
})
else
if skillEntity:getEffect() ~= nil then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL,
skillMatch = skillEntity:getPosition(),
count = 0,
})
end
if elementTypeCount > 0 then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK,
skillMatch = elementType,
count = elementTypeCount,
})
end
end
else
---- 普攻
if elementTypeCount > 0 then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK,
skillMatch = elementType,
count = elementTypeCount,
})
end
end
-- if assistingList then
-- table.insert(self.instructions, {
-- name = BattleConst.INSTRUCTION_NAME.ASSISTING,
-- assistingList = assistingList,
-- })
-- end
end
local generateEliminateEffects = function(instructions, skillEntity, battleController)
local eliminateEffects = skillEntity:getEliminateEffects(battleController)
if not eliminateEffects then
return
end
local effectList
for _, buffEntity in ipairs(eliminateEffects) do
if not effectList then
effectList = {}
end
table.insert(effectList, buffEntity)
end
if effectList then
local unit = {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
}
table.insert(instructions, unit)
end
end
local generateLinkEffects = function(instructions, skillEntity, elementType)
if not skillEntity:getLinkEffects() or not elementType then
return
end
local effectList
for type, buffEntities in pairs(skillEntity:getLinkEffects()) do
local buffEntity = buffEntities[elementType]
if buffEntity then
if not effectList then
effectList = {}
end
table.insert(effectList, buffEntity)
end
end
if effectList then
local unit = {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
}
table.insert(instructions, unit)
end
end
local generateInfluenceEffects = function(instructions, skillEntity, influenceElementTypeMap)
if not skillEntity:getInInfluenceEffects() or not influenceElementTypeMap then
return
end
for influenceElementType , _ in pairs(influenceElementTypeMap) do
local effectList
for type, buffEntities in pairs(skillEntity:getInInfluenceEffects()) do
local buffEntity = buffEntities[influenceElementType]
if buffEntity then
if not effectList then
effectList = {}
end
table.insert(effectList, buffEntity)
end
end
if effectList then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
})
end
end
end
local generateElementCountEffect = function(instructions, skillEntity, elementType, lineCount)
if not skillEntity:getElementCountEffect() or not elementType then
return
end
local effectList
for rogueSkill, list in pairs(skillEntity:getElementCountEffect()) do
for index, buffEntities in pairs(list) do
local originBuffEntity = buffEntities.origin
local useBuffEntity = buffEntities.use
if not effectList then
effectList = {}
end
local newNum = originBuffEntity:getEffectNum() * lineCount
useBuffEntity:setEffectNum(newNum)
table.insert(effectList, useBuffEntity)
end
end
if effectList then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
})
end
end
local generateSkillAttackBeforeEffects = function(instructions, skillEntity)
if not skillEntity:getSkillAttackBeforeEffects() then
return
end
local effectList
for rogueSkill, list in pairs(skillEntity:getSkillAttackBeforeEffects()) do
for index, buffEntity in pairs(list) do
if not effectList then
effectList = {}
end
table.insert(effectList, buffEntity)
end
end
if effectList then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
})
end
end
local generateLinkCountMoreEffects = function(instructions, skillEntity, lineCount)
if not skillEntity:getLinkCountMoreEffects() then
return
end
local effectList
for rogueSkill, list in pairs(skillEntity:getLinkCountMoreEffects()) do
for index, info in pairs(list) do
if info.paramsCount and info.paramsCount <= lineCount then
if not effectList then
effectList = {}
end
table.insert(effectList, info.buffEntity)
end
end
end
if effectList then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
})
end
end
local generateLinkCountPowerEffects = function(instructions, skillEntity, lineCount)
if not skillEntity:getLinkCountPowerEffects() then
return
end
local effectList
for rogueSkill, list in pairs(skillEntity:getLinkCountPowerEffects()) do
for index, info in pairs(list) do
if info.paramsCount and info.paramsCount <= lineCount then
local power = lineCount // info.paramsCount
if not effectList then
effectList = {}
end
local newNum = info.originBuffEntity:getEffectNum() * power
info.useBuffEntity:setEffectNum(newNum)
table.insert(effectList, info.useBuffEntity)
end
end
end
if effectList then
table.insert(instructions, {
name = BattleConst.INSTRUCTION_NAME.ADD_CUR_ROUND_ATTR,
effectList = effectList
})
end
end
BattleInstructionsHelper._generateBuffInstructions = function(instructions, skillEntity, elementType, lineCount, influenceElementTypeMap, battleController)
if skillEntity then
generateEliminateEffects(instructions, skillEntity, battleController)
generateLinkEffects(instructions, skillEntity, elementType)
generateInfluenceEffects(instructions, skillEntity, influenceElementTypeMap)
generateElementCountEffect(instructions, skillEntity, elementType, lineCount)
generateSkillAttackBeforeEffects(instructions, skillEntity)
generateLinkCountMoreEffects(instructions, skillEntity, lineCount)
generateLinkCountPowerEffects(instructions, skillEntity, lineCount)
end
end
BattleInstructionsHelper.generateInstructions = function(skillEntity, elementType, lineCount, influenceElementTypeMap, elementTypeMap, battleController)
local elementTypeCount = 0
local instructions = {}
-- local assistingList = nil
---- 援助
for element, count in pairs(elementTypeMap) do
-- if element == elementType then
elementTypeCount = elementTypeCount + count
-- else
-- if assistingList == nil then
-- assistingList = {}
-- end
-- local obj = {
-- count = count,
-- skillMatch = element,
-- }
-- table.insert(assistingList, obj)
-- end
end
battleController:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.ELIMINATION_COUNT, elementTypeCount)
if lineCount >= 6 then
battleController:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.LINK_COUNT_OVER_6, 1)
end
if lineCount >= 8 then
battleController:addTaskProgress(BattleConst.BATTLE_TASK_FIELD.LINK_COUNT_OVER_8, 1)
end
-- 攻击
BattleInstructionsHelper._generateAttackInstructions(instructions, skillEntity, elementType, elementTypeCount)
---- 加buff
BattleInstructionsHelper._generateBuffInstructions(instructions, skillEntity, elementType, lineCount, influenceElementTypeMap, battleController)
return instructions
end
return BattleInstructionsHelper

10
lua/app/module/battle/helper/battle_instructions_helper.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 6fd938e7da92c8e4e9a0b7560081b1cd
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

15
lua/app/module/battle/helper/battle_passive.lua
View File

@ -49,6 +49,18 @@ local function _checkActiveSkillHit(unitComp, skill, targetComp)
return 1 return 1
end end
local function _checkOnActiveSkillBefore(unitComp, skill, targetComp)
return 1
end
local function _checkOnDeadByBurn(unitComp, skill, targetComp)
return 1
end
local function _checkOnDeadBySkill(unitComp, skill, targetComp)
return 1
end
local function _checkOnDead(unitComp, skill, targetComp) local function _checkOnDead(unitComp, skill, targetComp)
return 1 return 1
end end
@ -59,6 +71,9 @@ BattlePassive.checkTrigger = {
[PASSIVE_EVENT.HP_LOWER_THAN] = _checkhpLowerThan, [PASSIVE_EVENT.HP_LOWER_THAN] = _checkhpLowerThan,
[PASSIVE_EVENT.USE_NORMAL_SKILL] = _checkUseNormalSkill, [PASSIVE_EVENT.USE_NORMAL_SKILL] = _checkUseNormalSkill,
[PASSIVE_EVENT.ACTIVE_SKILL_HIT] = _checkActiveSkillHit, [PASSIVE_EVENT.ACTIVE_SKILL_HIT] = _checkActiveSkillHit,
[PASSIVE_EVENT.ON_ACTIVE_SKILL_BEFORE] = _checkOnActiveSkillBefore,
[PASSIVE_EVENT.ON_DEAD_BY_BURN] = _checkOnDeadByBurn,
[PASSIVE_EVENT.ON_DEAD_BY_SKILL] = _checkOnDeadBySkill,
[PASSIVE_EVENT.ON_DEAD] = _checkOnDead, [PASSIVE_EVENT.ON_DEAD] = _checkOnDead,
} }

84
lua/app/module/battle/helper/battle_skill_condition_handle.lua Normal file
View File

@ -0,0 +1,84 @@
local BattleConst = require "app/module/battle/battle_const"
local BattleSkillConditionHandle = {}
local SKILL_CONDITION_REL_TYPE = BattleConst.SKILL_CONDITION_REL_TYPE
local SKILL_CONDITION_TYPE = BattleConst.SKILL_CONDITION_TYPE
local DEFAULT_FACTOR = BattleConst.DEFAULT_FACTOR
local function _judgeTargetState(buffCondition, conditionRel, target, battleController)
local num = target:getBuffCountByName(buffCondition.attr)
if num > 0 then -- 拥有这个buff
return true
end
return false
end
local function _judgeTargetAttr(buffCondition, conditionRel, target, battleController)
local attrNum = 0
if buffCondition.attr == "hpp" then
attrNum = target.unitEntity:getHpPercent() * DEFAULT_FACTOR
else
attrNum = target.unitEntity:getAttrValue(buffCondition.attr)
end
return BattleSkillConditionHandle._strOperatorOverloading(buffCondition.op, attrNum, buffCondition.v)
end
BattleSkillConditionHandle._judgeSkillEffectCondition = {
[SKILL_CONDITION_TYPE.STATE] = _judgeTargetState,
[SKILL_CONDITION_TYPE.ATTR] = _judgeTargetAttr,
}
BattleSkillConditionHandle._strOperatorOverloading = function(opStr, value1, value2)
if opStr == "<" then
return value1 < value2
elseif opStr == "<=" then
return value1 <= value2
elseif opStr == "=" then
return value1 == value2
elseif opStr == ">" then
return value1 > value2
elseif opStr == ">=" then
return value1 >= value2
elseif opStr == "!=" then
return value1 ~= value2
end
return false
end
function BattleSkillConditionHandle.judgeSkillEffectCondition(buffConditions, conditionRel, battleController)
if not buffConditions or not conditionRel then
return true
end
local passConditionCount = 0
for _, condition in ipairs(buffConditions) do
local func = BattleSkillConditionHandle._judgeSkillEffectCondition[condition.type]
if func then
local target
if condition.side == BattleConst.SIDE_ATK then
target = battleController.atkTeam:getMainUnit()
else
target = battleController.defTeam:getMainUnit()
end
if func(condition, conditionRel, target, battleController) then
passConditionCount = passConditionCount + 1
end
end
end
if conditionRel == SKILL_CONDITION_REL_TYPE.AND then
if passConditionCount >= #buffConditions then
return true
end
elseif conditionRel == SKILL_CONDITION_REL_TYPE.OR then
if passConditionCount > 0 then
return true
end
end
return false
end
return BattleSkillConditionHandle

10
lua/app/module/battle/helper/battle_skill_condition_handle.lua.meta Normal file
View File

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 9858e4faf8623ec4983583f58ea463ba
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}

59
lua/app/module/battle/skill/battle_board_skill_handle.lua
View File

@ -37,10 +37,22 @@ local function _takeChangeAround(posId, skillEntity, gridEntities, sequenceEntit
end end
end end
local posIdInfos = ModuleManager.BattleManager:getAroundPosIdsByList(posId, boardrange, cludePosIdsMap) local posIdInfos = ModuleManager.BattleManager:getAroundPosIdsByList(posId, boardrange, cludePosIdsMap)
local mainElementType
for _, info in ipairs(battleController.battleData:getGridSequence()) do
local entity = gridEntities[info.posId]
local skillId = entity:getSkillId()
if not skillId then
mainElementType = entity:getElementType()
break
end
end
if not mainElementType then
return
end
for _, info in ipairs(posIdInfos) do for _, info in ipairs(posIdInfos) do
local entity = gridEntities[info.posId] local entity = gridEntities[info.posId]
if entity then if entity then
entity:setElementType(skillEntity:getSkillTypeParameter()[1]) entity:setElementType(mainElementType)
end end
end end
end end
@ -240,7 +252,7 @@ local function _takeKillMaxElementAndHeal(atkUnitComp, skillEntity, battleContro
local list = elementMap[maxElement] local list = elementMap[maxElement]
local heal = count * effectNum * atkUnitComp.unitEntity:getAtk() // GConst.BattleConst.DEFAULT_FACTOR local heal = count * effectNum * atkUnitComp.unitEntity:getAtk() // GConst.BattleConst.DEFAULT_FACTOR
atkUnitComp:takeDamageOrCure(atkUnitComp, heal, BattleConst.EFFECT_TYPE.HEAL, 0) atkUnitComp:takeDamageOrCure(atkUnitComp, heal, BattleConst.EFFECT_TYPE.HEAL, 0, BattleConst.SPECIAL_DAMAGE_OR_CURE_TYPE.KILL_MAX_ELEMENT_AND_HEAL)
battleController:killGrids(list) battleController:killGrids(list)
end end
@ -312,6 +324,47 @@ local function _takeKillRowAndColumn(atkUnitComp, skillEntity, battleController)
battleController:killRowOrColumn(infoList) battleController:killRowOrColumn(infoList)
end end
local function _takeAddSkillEnergy(atkUnitComp, skillEntity, battleController)
local params = skillEntity:getEliminateSkillParameter()
if not params[2] or params[2] <= 0 then
return
end
local elementType = params[1]
local addEnergy = params[2]
local elementTypeMap
if elementType == BattleConst.ELEMENT_TYPE.NONE then
local boardSkills
local count = 0
for eType, entity in pairs(battleController.battleData:getSkillEntities()) do
if not boardSkills then
boardSkills = {}
end
table.insert(boardSkills, eType)
count = count + 1
end
if count <= 0 then
return
end
elementType = boardSkills[math.random(1, count)]
end
elementTypeMap = {[elementType] = addEnergy}
battleController.battleData:addSkillEnergy(elementTypeMap)
battleController.battleUI:refreshSkill()
end
local function _takeChangeElementType(atkUnitComp, skillEntity, battleController)
local params = skillEntity:getEliminateSkillParameter()
if not params[2] or params[2] <= 0 then
return
end
local elementType = params[1]
local changeCount = params[2]
battleController:changeElementType(changeCount, elementType)
end
BattleBoardSkillHandle._activeBoardSkill = { BattleBoardSkillHandle._activeBoardSkill = {
[SKILL_TYPE.ELIMINATION] = _takeElimination, [SKILL_TYPE.ELIMINATION] = _takeElimination,
[SKILL_TYPE.CHANGE_AROUND] = _takeChangeAround, [SKILL_TYPE.CHANGE_AROUND] = _takeChangeAround,
@ -326,6 +379,8 @@ BattleBoardSkillHandle._activeAttackOverSkill = {
[SKILL_TYPE.RANDOM_KILL_ROW_OR_COLUMN] = _takeRandomKillRowOrColumn, [SKILL_TYPE.RANDOM_KILL_ROW_OR_COLUMN] = _takeRandomKillRowOrColumn,
[SKILL_TYPE.KILL_MAX_ELEMENT_AND_HEAL] = _takeKillMaxElementAndHeal, [SKILL_TYPE.KILL_MAX_ELEMENT_AND_HEAL] = _takeKillMaxElementAndHeal,
[SKILL_TYPE.KILL_ROW_AND_COLUMN] = _takeKillRowAndColumn, [SKILL_TYPE.KILL_ROW_AND_COLUMN] = _takeKillRowAndColumn,
[SKILL_TYPE.ADD_SKILL_ENERGY] = _takeAddSkillEnergy,
[SKILL_TYPE.CHANGE_ELEMENT_TYPE] = _takeChangeElementType,
} }
function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities, battleController) function BattleBoardSkillHandle.activeBoardSkill(posId, skillEntity, gridEntities, sequenceEntities, battleController)

Some files were not shown because too many files have changed in this diff Show More