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

Merge branch 'dev_20230809' into dev_20230815

Browse Source 
# Conflicts:
#	lua/app/config/const.lua
#	lua/app/config/item.lua
#	lua/app/config/skill_rogue.lua
#	lua/app/config/strings/cn/buff.lua
#	lua/app/config/strings/cn/item.lua
#	lua/app/config/strings/de/item.lua
#	lua/app/config/strings/en/item.lua
#	lua/app/config/strings/es/item.lua
#	lua/app/config/strings/fr/item.lua
#	lua/app/config/strings/id/item.lua
#	lua/app/config/strings/ja/item.lua
#	lua/app/config/strings/ja/skill.lua
#	lua/app/config/strings/ko/item.lua
#	lua/app/config/strings/pt/item.lua
#	lua/app/config/strings/ru/item.lua
#	lua/app/config/strings/th/item.lua
#	lua/app/config/strings/vi/item.lua
#	lua/app/config/strings/zh/item.lua
#	lua/app/config/strings/zh/skill.lua
This commit is contained in:
xiekaidong 2023-08-08 15:58:56 +08:00
commit 42ad5ec9fa
141 changed files with 6045 additions and 4042 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,10 @@ AudioManager.EFFECT_ID = {
LINK_CANCEL = "assets/arts/sounds/sfx/battle/link_cancel.wav", LINK_CANCEL = "assets/arts/sounds/sfx/battle/link_cancel.wav",
FUNC_OPEN = "assets/arts/sounds/sfx/ui/func_open.wav", FUNC_OPEN = "assets/arts/sounds/sfx/ui/func_open.wav",
BATTLE_BOX_OPEN = "assets/arts/sounds/sfx/ui/ui_battle_open_box.wav", BATTLE_BOX_OPEN = "assets/arts/sounds/sfx/ui/ui_battle_open_box.wav",
EQUIP_WEAPON_UP = "assets/arts/sounds/sfx/ui/equip_up.wav",
EQUIP_ARMOR_UP = "assets/arts/sounds/sfx/ui/armor_up.wav",
DUNGEON_SMASH = "assets/arts/sounds/sfx/ui/smash.wav",
STAR_GET = "assets/arts/sounds/sfx/ui/star_get.wav",
} }
AudioManager.BO_EFFECT_ID = { AudioManager.BO_EFFECT_ID = {

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

@ -134,6 +134,8 @@ BIReport.ITEM_GET_TYPE = {
WEAPON_GIFT = "WeaponGift", WEAPON_GIFT = "WeaponGift",
ARMOR_GIFT = "ArmorGift", ARMOR_GIFT = "ArmorGift",
EQUIP_UPGRADE = "EquipUpgrade", EQUIP_UPGRADE = "EquipUpgrade",
ARMOR_UPGRADE = "ArmorUpgrade",
OFFLINE_RECOVERY = "OfflineRecovery",
} }
BIReport.ADS_CLICK_TYPE = { BIReport.ADS_CLICK_TYPE = {
@ -250,6 +252,26 @@ BIReport.ARENA_OPT_TYPE = {
SETTLEMENT = "Settlement", SETTLEMENT = "Settlement",
} }
BIReport.PAY_UI_SHOW_TYPE = {
LOGIN_POP = "LoginPop",
TRIGGER_POP = "TriggerPop",
CLICK_SHOW = "ClickShow",
SHOP_SHOW = "ShopShow",
}
BIReport.BOX_OPEN_BOX_TYPE = {
SHOP = "Shop",
ACTIVITY = "Activity",
}
BIReport.BOX_OPEN_OPEN_TYPE = {
USE_KEY = "UseKey",
USE_GEM = "UseGem",
BOUNTY = "Bounty",
ARENA_BOUNTY = "ArenaBounty",
}
-- b6 -- b6
local EVENT_NAME_EXIT = "client_exit" local EVENT_NAME_EXIT = "client_exit"
local EVENT_NAME_FIGHT = "client_fight" local EVENT_NAME_FIGHT = "client_fight"
@ -279,6 +301,7 @@ local EVENT_NAME_IRONSOURCE_AD_REVENUE = "client_ironsource_ad_revenue" -- applo
local EVENT_NAME_DAILY_CHALLENGE_OPT = "client_daily_challenge_opt" local EVENT_NAME_DAILY_CHALLENGE_OPT = "client_daily_challenge_opt"
local EVENT_NAME_ARENA_OPT = "client_arena_opt"-- 竞技场 local EVENT_NAME_ARENA_OPT = "client_arena_opt"-- 竞技场
local EVENT_NAME_MISCELLANEOUS_OPT = "event_name_miscellaneous_opt" -- 一些杂项 local EVENT_NAME_MISCELLANEOUS_OPT = "event_name_miscellaneous_opt" -- 一些杂项
local EVENT_BOX_OPEN = "client_box_open"
function BIReport:setIsNewPlayer(isNewPlayer) function BIReport:setIsNewPlayer(isNewPlayer)
self.isNewPlayer = isNewPlayer self.isNewPlayer = isNewPlayer
@ -350,6 +373,9 @@ function BIReport:report(name, args)
local str, lv, atk, hp = DataManager.FormationData:getStageFormationBIStr() local str, lv, atk, hp = DataManager.FormationData:getStageFormationBIStr()
args.formation_atk = atk args.formation_atk = atk
args.formation_hp = hp args.formation_hp = hp
if DataManager.DungeonData then
args.dungeon_progress = DataManager.DungeonData:getDungeonBIStr()
end
end end
args.current_version = CS.BF.BFMain.Instance.GameLaunchMgr:GetCurrentVersion() args.current_version = CS.BF.BFMain.Instance.GameLaunchMgr:GetCurrentVersion()
args.is_new_player = self.isNewPlayer args.is_new_player = self.isNewPlayer
@ -1084,11 +1110,12 @@ function BIReport:postVitGet(num, getType, vitAll)
end end
-- 体力使用 -- 体力使用
function BIReport:postVitUse(num) function BIReport:postVitUse(num, getType)
-- EnergyNum 当前体力数 减少体力时 Int 使用体力数量 -- EnergyNum 当前体力数 减少体力时 Int 使用体力数量
-- IsNew 是否是新用户 Boolean 是否为当天新用户，True = 是，False = 否 -- IsNew 是否是新用户 Boolean 是否为当天新用户，True = 是，False = 否
-- MaxChapter 最大章节 Int 已解锁的最大章节 -- MaxChapter 最大章节 Int 已解锁的最大章节
local args = { local args = {
type = getType,
vit_num = num, vit_num = num,
vit_all = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_VIT), vit_all = DataManager.BagData.ItemData:getItemNumById(GConst.ItemConst.ITEM_ID_VIT),
} }
@ -1391,10 +1418,11 @@ end
-- 内购相关界面展示,包括弹出/主动打开(如果是打开商城页签,钻石礼包只上报id2,章节礼包只上报首个可购买章节id) -- 内购相关界面展示,包括弹出/主动打开(如果是打开商城页签,钻石礼包只上报id2,章节礼包只上报首个可购买章节id)
-- giftType为BIReport.GIFT_TYPE -- giftType为BIReport.GIFT_TYPE
function BIReport:postPayUIShow(giftType, giftId) function BIReport:postPayUIShow(giftType, giftId, showType)
local args = { local args = {
gift_type = giftType, gift_type = giftType,
gift_id = giftId, gift_id = giftId,
show_type = showType
} }
self:report(EVENT_NAME_PAY_UI_SHOW, args) self:report(EVENT_NAME_PAY_UI_SHOW, args)
end end
@ -1467,7 +1495,12 @@ function BIReport:postAppLovinAdRevenue(msg)
self:postAdjustAdRevenueAppLovinMAX(args.revenue, args.network_name, args.ad_unit_identifier, args.placement) self:postAdjustAdRevenueAppLovinMAX(args.revenue, args.network_name, args.ad_unit_identifier, args.placement)
end end
local args2 = { local args2 = {
applovin_revenue = args.revenue ad_platform = "applovin",
ad_source = args.network_name,
ad_unit_name = args.ad_unit_identifier,
ad_format = args.ad_format,
currency = "USD",
value = args.revenue,
} }
self:postFirebaseLog("ad_impression", args2) self:postFirebaseLog("ad_impression", args2)
self:logAppsFlyerAdRevenue(3, args.network_name, args.revenue, args) self:logAppsFlyerAdRevenue(3, args.network_name, args.revenue, args)
@ -1486,7 +1519,12 @@ function BIReport:postIronSourceAdRevenue(msg)
end end
if args.revenue then if args.revenue then
local args2 = { local args2 = {
ironsource_revenue = args.revenue ad_platform = "ironSource",
ad_source = args.network_name,
ad_unit_name = args.ad_unit_identifier,
ad_format = args.ad_format,
currency = "USD",
value = args.revenue
} }
self:postFirebaseLog("ad_impression", args2) self:postFirebaseLog("ad_impression", args2)
self:logAppsFlyerAdRevenue(2, args.network_name, args.revenue, args) self:logAppsFlyerAdRevenue(2, args.network_name, args.revenue, args)
@ -1584,4 +1622,15 @@ function BIReport:postPbAuthfailed(pbName, lastLoginInfo, authFailToLogin)
self:report(EVENT_NAME_NETWORK_OPT, args) self:report(EVENT_NAME_NETWORK_OPT, args)
end end
function BIReport:postBoxOpen(id, boxType, openType, box_level, rewards)
local args = {
box_type = boxType,
open_type = openType,
box_item_id = id,
box_level = box_level,
rewards_str = GFunc.getItemRewardsStr(rewards)
}
self:report(EVENT_BOX_OPEN, args)
end
return BIReport return BIReport

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

@ -432,10 +432,10 @@ function LocalData:GetMarktrailHero()
end end
function LocalData:saveBattleSnapshot(snapshot) function LocalData:saveBattleSnapshot(snapshot)
self:setString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), json.encode(snapshot))
if EDITOR_MODE then if EDITOR_MODE then
Logger.logHighlight(json.encode(snapshot)) Logger.logHighlight(json.encode(snapshot))
end end
self:setString(LocalData:getRoleKey(LOCAL_DATA_KEY.BATTLE_SNAPSHOT), json.encode(snapshot))
end end
function LocalData:getBattleSnapshot() function LocalData:getBattleSnapshot()

1
lua/app/common/server_push_manager.lua
View File

@ -21,6 +21,7 @@ function ServerPushManager:initWhenLogin()
self:addServerPushListener(ProtoMsgType.FromMsgEnum.TriggerGrowUpGift2Ntf, ModuleManager.ShopManager, ModuleManager.ShopManager.onTriggerGrowUpGift) self:addServerPushListener(ProtoMsgType.FromMsgEnum.TriggerGrowUpGift2Ntf, ModuleManager.ShopManager, ModuleManager.ShopManager.onTriggerGrowUpGift)
self:addServerPushListener(ProtoMsgType.FromMsgEnum.MallDailyResetNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onMallDailyReset) self:addServerPushListener(ProtoMsgType.FromMsgEnum.MallDailyResetNtf, ModuleManager.ShopManager, ModuleManager.ShopManager.onMallDailyReset)
self:addServerPushListener(ProtoMsgType.FromMsgEnum.AIHelpUnreadNtf, ModuleManager.GameSettingManager, ModuleManager.GameSettingManager.rspAiHelperNtf) self:addServerPushListener(ProtoMsgType.FromMsgEnum.AIHelpUnreadNtf, ModuleManager.GameSettingManager, ModuleManager.GameSettingManager.rspAiHelperNtf)
self:addServerPushListener(ProtoMsgType.FromMsgEnum.RecoveryNtf, ModuleManager.ItemManager, ModuleManager.ItemManager.rspRecoveryNtf)
end end
---- 移除全局推送监听 ---- 移除全局推送监听

52
lua/app/config/act_chapter_store.lua
View File

@ -141,8 +141,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -181,8 +181,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -221,8 +221,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
} }
@ -261,8 +261,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
} }
@ -301,8 +301,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
} }
@ -341,8 +341,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
} }
@ -381,8 +381,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=8, ["num"]=8,
["num_for_nothing"]="Xg==" ["num_for_nothing"]="Xg=="
} }
@ -421,8 +421,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=8, ["num"]=8,
["num_for_nothing"]="Xg==" ["num_for_nothing"]="Xg=="
} }
@ -461,8 +461,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=8, ["num"]=8,
["num_for_nothing"]="Xg==" ["num_for_nothing"]="Xg=="
} }
@ -501,8 +501,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=20, ["num"]=20,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VAg="
} }
@ -541,8 +541,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=20, ["num"]=20,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VAg="
} }
@ -581,8 +581,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=20, ["num"]=20,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VAg="
} }
@ -621,8 +621,8 @@ local act_chapter_store = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=20, ["num"]=20,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VAg="
} }

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

@ -206,8 +206,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
} }
@ -244,8 +244,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
} }
@ -282,8 +282,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=8, ["num"]=8,
["num_for_nothing"]="Xg==" ["num_for_nothing"]="Xg=="
} }
@ -320,8 +320,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
} }
@ -358,8 +358,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=18, ["num"]=18,
["num_for_nothing"]="VwA=" ["num_for_nothing"]="VwA="
} }
@ -396,8 +396,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=24, ["num"]=24,
["num_for_nothing"]="VAw=" ["num_for_nothing"]="VAw="
} }
@ -577,8 +577,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
} }
@ -619,8 +619,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
} }
@ -661,8 +661,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
} }
@ -703,8 +703,8 @@ local act_gift = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
} }

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

@ -23,8 +23,8 @@ local act_growup_gift_new = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=8, ["num"]=8,
["num_for_nothing"]="Xg==" ["num_for_nothing"]="Xg=="
} }
@ -57,8 +57,8 @@ local act_growup_gift_new = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=12, ["num"]=12,
["num_for_nothing"]="Vwo=" ["num_for_nothing"]="Vwo="
} }
@ -91,8 +91,8 @@ local act_growup_gift_new = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=24, ["num"]=24,
["num_for_nothing"]="VAw=" ["num_for_nothing"]="VAw="
} }
@ -125,8 +125,8 @@ local act_growup_gift_new = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=36, ["num"]=36,
["num_for_nothing"]="VQ4=" ["num_for_nothing"]="VQ4="
} }
@ -159,8 +159,8 @@ local act_growup_gift_new = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=96, ["num"]=96,
["num_for_nothing"]="Xw4=" ["num_for_nothing"]="Xw4="
} }
@ -193,8 +193,8 @@ local act_growup_gift_new = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=138, ["num"]=138,
["num_for_nothing"]="VwtU" ["num_for_nothing"]="VwtU"
} }

72
lua/app/config/arena_rank.lua
View File

@ -1047,8 +1047,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -1221,8 +1221,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -1395,8 +1395,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=2, ["num"]=2,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VA=="
} }
@ -1569,8 +1569,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
} }
@ -1743,8 +1743,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=4, ["num"]=4,
["num_for_nothing"]="Ug==" ["num_for_nothing"]="Ug=="
} }
@ -1917,8 +1917,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
} }
@ -3103,8 +3103,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -3277,8 +3277,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -3451,8 +3451,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=2, ["num"]=2,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VA=="
} }
@ -3625,8 +3625,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
} }
@ -3799,8 +3799,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=4, ["num"]=4,
["num_for_nothing"]="Ug==" ["num_for_nothing"]="Ug=="
} }
@ -3973,8 +3973,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
} }
@ -5145,8 +5145,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -5317,8 +5317,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
} }
@ -5489,8 +5489,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=2, ["num"]=2,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VA=="
} }
@ -5661,8 +5661,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
} }
@ -5833,8 +5833,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=4, ["num"]=4,
["num_for_nothing"]="Ug==" ["num_for_nothing"]="Ug=="
} }
@ -6005,8 +6005,8 @@ local arena_rank = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
} }

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

@ -723,6 +723,32 @@ local buff = {
["stack"]=2, ["stack"]=2,
["decr"]=1, ["decr"]=1,
["icon"]="skill_hurt_add" ["icon"]="skill_hurt_add"
},
[82]={
["id"]=82,
["name"]="shield_ice_rebound_200",
["buff_type"]=2,
["decr"]=3,
["icon"]="shield_ice",
["fx_continued"]={
26
},
["fx_disappear"]={
27
}
},
[83]={
["id"]=83,
["name"]="shield_rebound_100",
["buff_type"]=2,
["decr"]=3,
["icon"]="shield",
["fx_continued"]={
22
},
["fx_disappear"]={
23
}
} }
} }
local keys = { local keys = {
@ -807,12 +833,14 @@ local keys = {
["end_dmg_dec_all_add"]=buff[78], ["end_dmg_dec_all_add"]=buff[78],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_ice_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=81 count=83
} }
return config return config

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

@ -127,8 +127,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
100, 1,
100 1
} }
}, },
[2]={ [2]={
@ -278,8 +278,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
100, 1,
100 1
} }
}, },
[3]={ [3]={
@ -424,8 +424,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
100, 1,
100 1
} }
}, },
[4]={ [4]={
@ -621,8 +621,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
230, 1,
44 1
} }
}, },
[5]={ [5]={
@ -824,8 +824,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
1785, 1425,
4062 3528
} }
}, },
[6]={ [6]={
@ -1027,8 +1027,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
2511, 1976,
5397 5486
} }
}, },
[7]={ [7]={
@ -1246,8 +1246,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
4456, 3300,
7506 7539
} }
}, },
[8]={ [8]={
@ -1465,8 +1465,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
6127, 4837,
10184 9756
} }
}, },
[9]={ [9]={
@ -1684,8 +1684,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
7787, 6364,
12470 12027
} }
}, },
[10]={ [10]={
@ -1903,8 +1903,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
10159, 8546,
15963 14328
} }
}, },
[11]={ [11]={
@ -2122,8 +2122,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
12466, 10668,
18556 15012
} }
}, },
[12]={ [12]={
@ -2341,8 +2341,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
14126, 12196,
21487 16024
} }
}, },
[13]={ [13]={
@ -2560,8 +2560,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
15225, 13207,
23424 17506
} }
}, },
[14]={ [14]={
@ -2779,8 +2779,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
17392, 15201,
26737 18468
} }
}, },
[15]={ [15]={
@ -2998,8 +2998,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
18125, 15875,
28176 19426
} }
}, },
[16]={ [16]={
@ -3217,8 +3217,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
19440, 17085,
30378 21047
} }
}, },
[17]={ [17]={
@ -3436,8 +3436,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
20691, 18235,
32484 22088
} }
}, },
[18]={ [18]={
@ -3655,8 +3655,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
22146, 19574,
34908 23715
} }
}, },
[19]={ [19]={
@ -3874,8 +3874,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
23030, 20388,
36601 25138
} }
}, },
[20]={ [20]={
@ -4093,8 +4093,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
24712, 21935,
39364 26412
} }
}, },
[21]={ [21]={
@ -4312,8 +4312,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
26059, 23174,
41629 27434
} }
}, },
[22]={ [22]={
@ -4531,8 +4531,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
26965, 24007,
43375 28639
} }
}, },
[23]={ [23]={
@ -4750,8 +4750,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
27859, 24831,
45058 29814
} }
}, },
[24]={ [24]={
@ -4969,8 +4969,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
29509, 26348,
47863 31029
} }
}, },
[25]={ [25]={
@ -5188,8 +5188,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
29800, 26616,
48678 32214
} }
}, },
[26]={ [26]={
@ -5407,8 +5407,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
30716, 27459,
50392 33533
} }
}, },
[27]={ [27]={
@ -5626,8 +5626,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
32506, 29105,
53451 34852
} }
}, },
[28]={ [28]={
@ -5845,8 +5845,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
33303, 29839,
55081 36176
} }
}, },
[29]={ [29]={
@ -6064,8 +6064,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
34166, 30632,
56796 37485
} }
}, },
[30]={ [30]={
@ -6283,8 +6283,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
35718, 32061,
60278 38809
} }
}, },
[31]={ [31]={
@ -6502,8 +6502,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
37410, 33618,
63294 40252
} }
}, },
[32]={ [32]={
@ -6721,8 +6721,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
38984, 35066,
66067 43069
} }
}, },
[33]={ [33]={
@ -6940,8 +6940,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
41000, 36920,
69592 45891
} }
}, },
[34]={ [34]={
@ -7159,8 +7159,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
42574, 38368,
72471 49054
} }
}, },
[35]={ [35]={
@ -7377,8 +7377,8 @@ local chapter = {
} }
}, },
["daily_challenge_difficulty"]={ ["daily_challenge_difficulty"]={
46207, 41710,
78535 53745
} }
} }
} }

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

File diff suppressed because it is too large Load Diff

534
lua/app/config/chapter_board_daily_challenge.lua
View File

@ -2407,39 +2407,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
0, 0,
4 5
},
{
0,
4
},
{
0,
2
},
{
0,
1
},
{
0,
3
},
{
1,
0
},
{
1,
0
},
{
0,
1
},
{
0,
4
}, },
{ {
0, 0,
@ -2451,60 +2419,8 @@ local chapter_board_daily_challenge = {
}, },
{ {
0, 0,
3
},
{
1,
0
},
{
23,
2
},
{
23,
2
},
{
27,
1 1
}, },
{
27,
2
},
{
27,
3
},
{
0,
4
},
{
1,
0
},
{
23,
2
},
{
23,
2
},
{
27,
4
},
{
26,
0
},
{
27,
4
},
{ {
0, 0,
5 5
@ -2513,13 +2429,97 @@ local chapter_board_daily_challenge = {
1, 1,
0 0
}, },
{
1,
0
},
{
0,
1
},
{
0,
2
},
{
0,
1
},
{
0,
2
},
{
0,
1
},
{
1,
0
},
{
1,
0
},
{
0,
5
},
{
27,
1
},
{
27,
2
},
{
27,
1
},
{
0,
5
},
{
1,
0
},
{
1,
0
},
{
0,
1
},
{
27,
4
},
{ {
14, 14,
0 0
}, },
{ {
23, 27,
3 4
},
{
0,
1
},
{
1,
0
},
{
1,
0
},
{
0,
4
}, },
{ {
27, 27,
@ -2547,32 +2547,12 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
3 4
}, },
{ {
23, 23,
5 5
}, },
{
23,
5
},
{
23,
1
},
{
23,
1
},
{
1,
0
},
{
1,
0
},
{ {
23, 23,
3 3
@ -2581,17 +2561,37 @@ local chapter_board_daily_challenge = {
23, 23,
5 5
}, },
{
23,
4
},
{
1,
0
},
{
1,
0
},
{
23,
4
},
{ {
23, 23,
5 5
}, },
{ {
23, 23,
1 3
}, },
{ {
23, 23,
1 5
},
{
23,
4
}, },
{ {
1, 1,
@ -2619,7 +2619,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
0, 0,
3 1
}, },
{ {
1, 1,
@ -2651,7 +2651,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
0, 0,
3 1
}, },
{ {
1, 1,
@ -2675,7 +2675,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
27, 27,
3 1
}, },
{ {
0, 0,
@ -2703,7 +2703,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
27, 27,
4 5
}, },
{ {
25, 25,
@ -2731,7 +2731,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
27, 27,
5 4
}, },
{ {
0, 0,
@ -2751,7 +2751,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
2 4
}, },
{ {
23, 23,
@ -2763,7 +2763,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
5 1
}, },
{ {
1, 1,
@ -2779,7 +2779,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
1 4
}, },
{ {
14, 14,
@ -2787,7 +2787,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
3 4
}, },
{ {
1, 1,
@ -2866,16 +2866,16 @@ local chapter_board_daily_challenge = {
5 5
}, },
{ {
23, 0,
3 3
}, },
{ {
23, 0,
2 2
}, },
{ {
23, 0,
1 3
}, },
{ {
0, 0,
@ -2890,24 +2890,24 @@ local chapter_board_daily_challenge = {
0 0
}, },
{ {
0, 25,
5
},
{
23,
4
},
{
26,
0 0
}, },
{ {
23, 25,
2 0
}, },
{ {
0, 25,
5 0
},
{
25,
0
},
{
25,
0
}, },
{ {
1, 1,
@ -2919,15 +2919,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
4 3
},
{
23,
5
},
{
23,
4
}, },
{ {
23, 23,
@ -2935,51 +2927,59 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
2 3
},
{
23,
3
},
{
23,
3
},
{
23,
3
}, },
{ {
23, 23,
1 1
}, },
{
26,
0
},
{ {
23, 23,
2 1
}, },
{ {
26, 26,
0 0
}, },
{
23,
1
},
{
26,
0
},
{
23,
1
},
{ {
23, 23,
4 4
}, },
{ {
26, 23,
0 4
}, },
{ {
23, 23,
2 4
},
{
26,
0
},
{
23,
2
},
{
23,
1
},
{
23,
2
},
{
23,
3
}, },
{ {
14, 14,
@ -2987,7 +2987,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
1 4
}, },
{ {
23, 23,
@ -2995,16 +2995,12 @@ local chapter_board_daily_challenge = {
}, },
{ {
23, 23,
3 4
} }
} }
}, },
[16]={ [16]={
["board_daily_challenge"]={ ["board_daily_challenge"]={
{
1,
0
},
{ {
1, 1,
0 0
@ -3013,33 +3009,9 @@ local chapter_board_daily_challenge = {
0, 0,
3 3
}, },
{
24,
0
},
{
24,
0
},
{ {
0, 0,
2 5
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
0,
4
}, },
{ {
0, 0,
@ -3069,6 +3041,30 @@ local chapter_board_daily_challenge = {
0, 0,
4 4
}, },
{
0,
5
},
{
0,
4
},
{
0,
1
},
{
1,
0
},
{
1,
0
},
{
0,
3
},
{ {
0, 0,
4 4
@ -3079,14 +3075,18 @@ local chapter_board_daily_challenge = {
}, },
{ {
0, 0,
5 4
}, },
{ {
0, 0,
5 1
}, },
{ {
23, 1,
0
},
{
0,
1 1
}, },
{ {
@ -3094,7 +3094,7 @@ local chapter_board_daily_challenge = {
0 0
}, },
{ {
23, 0,
3 3
}, },
{ {
@ -3102,15 +3102,15 @@ local chapter_board_daily_challenge = {
4 4
}, },
{ {
23, 0,
5 1
}, },
{ {
24, 24,
0 0
}, },
{ {
23, 0,
3 3
}, },
{ {
@ -3194,8 +3194,8 @@ local chapter_board_daily_challenge = {
0 0
}, },
{ {
23, 1,
3 0
} }
} }
}, },
@ -3223,7 +3223,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
0, 0,
4 1
}, },
{ {
1, 1,
@ -3279,7 +3279,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
0, 0,
5 2
}, },
{ {
32, 32,
@ -3303,11 +3303,11 @@ local chapter_board_daily_challenge = {
}, },
{ {
4, 4,
4 2
}, },
{ {
4, 4,
5 1
}, },
{ {
1, 1,
@ -3395,7 +3395,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
1, 1,
0 1
} }
} }
}, },
@ -4122,15 +4122,15 @@ local chapter_board_daily_challenge = {
2 2
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
@ -4146,23 +4146,23 @@ local chapter_board_daily_challenge = {
1 1
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
@ -4170,31 +4170,31 @@ local chapter_board_daily_challenge = {
3 3
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
}, },
{ {
1, 31,
0 0
} }
} }
@ -4317,6 +4317,34 @@ local chapter_board_daily_challenge = {
1, 1,
0 0
}, },
{
0,
0
},
{
0,
0
},
{
34,
3
},
{
0,
0
},
{
0,
0
},
{
1,
0
},
{
1,
0
},
{ {
34, 34,
1 1
@ -4325,14 +4353,14 @@ local chapter_board_daily_challenge = {
34, 34,
2 2
}, },
{
14,
0
},
{ {
34, 34,
3 3
}, },
{
34,
4
},
{ {
34, 34,
5 5
@ -4353,34 +4381,6 @@ local chapter_board_daily_challenge = {
1, 1,
0 0
}, },
{
14,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{
1,
0
},
{ {
1, 1,
0 0
@ -4499,7 +4499,7 @@ local chapter_board_daily_challenge = {
}, },
{ {
0, 0,
2 3
}, },
{ {
32, 32,
@ -4522,12 +4522,12 @@ local chapter_board_daily_challenge = {
0 0
}, },
{ {
0, 32,
2 0
}, },
{ {
0, 32,
2 0
}, },
{ {
32, 32,

56
lua/app/config/chapter_daily_challenge.lua
View File

@ -55,6 +55,14 @@ local chapter_daily_challenge = {
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
["begin_buff_id"]={ ["begin_buff_id"]={
@ -276,6 +284,14 @@ local chapter_daily_challenge = {
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
["begin_buff_id"]={ ["begin_buff_id"]={
@ -497,6 +513,14 @@ local chapter_daily_challenge = {
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
["begin_buff_id"]={ ["begin_buff_id"]={
@ -718,6 +742,14 @@ local chapter_daily_challenge = {
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
["begin_buff_id"]={ ["begin_buff_id"]={
@ -939,6 +971,14 @@ local chapter_daily_challenge = {
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
["begin_buff_id"]={ ["begin_buff_id"]={
@ -1160,6 +1200,14 @@ local chapter_daily_challenge = {
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
["begin_buff_id"]={ ["begin_buff_id"]={
@ -1381,6 +1429,14 @@ local chapter_daily_challenge = {
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=10,
["num_for_nothing"]="Vwg="
} }
}, },
["begin_buff_id"]={ ["begin_buff_id"]={

160
lua/app/config/chapter_dungeon_armor.lua
View File

@ -1793,14 +1793,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1007,
["id_for_nothing"]="VwhcBA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -1938,14 +1930,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1013,
["id_for_nothing"]="VwhdAA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -2083,14 +2067,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1019,
["id_for_nothing"]="VwhdCg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -2228,14 +2204,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1025,
["id_for_nothing"]="VwheBg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -2889,14 +2857,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1007,
["id_for_nothing"]="VwhcBA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -3028,14 +2988,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1013,
["id_for_nothing"]="VwhdAA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -3167,14 +3119,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1019,
["id_for_nothing"]="VwhdCg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -3306,14 +3250,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1025,
["id_for_nothing"]="VwheBg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -5021,14 +4957,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1008,
["id_for_nothing"]="VwhcCw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -5160,14 +5088,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1014,
["id_for_nothing"]="VwhdBw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -5299,14 +5219,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1020,
["id_for_nothing"]="VwheAw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -5438,14 +5350,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1026,
["id_for_nothing"]="VwheBQ==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -7153,14 +7057,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1009,
["id_for_nothing"]="VwhcCg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -7292,14 +7188,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1015,
["id_for_nothing"]="VwhdBg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -7431,14 +7319,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1021,
["id_for_nothing"]="VwheAg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -7570,14 +7450,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1027,
["id_for_nothing"]="VwheBA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -9285,14 +9157,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1010,
["id_for_nothing"]="VwhdAw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -9424,14 +9288,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1016,
["id_for_nothing"]="VwhdBQ==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -9563,14 +9419,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1022,
["id_for_nothing"]="VwheAQ==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -9702,14 +9550,6 @@ local chapter_dungeon_armor = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1028,
["id_for_nothing"]="VwheCw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",

240
lua/app/config/chapter_dungeon_equip.lua
View File

@ -30,6 +30,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -95,6 +103,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=500, ["num"]=500,
["num_for_nothing"]="Uwhc" ["num_for_nothing"]="Uwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -160,6 +176,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=600, ["num"]=600,
["num_for_nothing"]="UAhc" ["num_for_nothing"]="UAhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -239,6 +263,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=600, ["num"]=600,
["num_for_nothing"]="UAhc" ["num_for_nothing"]="UAhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -318,6 +350,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=700, ["num"]=700,
["num_for_nothing"]="UQhc" ["num_for_nothing"]="UQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -397,6 +437,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=700, ["num"]=700,
["num_for_nothing"]="UQhc" ["num_for_nothing"]="UQhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -431,14 +479,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1001,
["id_for_nothing"]="VwhcAg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -490,6 +530,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=800, ["num"]=800,
["num_for_nothing"]="Xghc" ["num_for_nothing"]="Xghc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -524,14 +572,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1001,
["id_for_nothing"]="VwhcAg==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -583,6 +623,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=800, ["num"]=800,
["num_for_nothing"]="Xghc" ["num_for_nothing"]="Xghc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -662,6 +710,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=900, ["num"]=900,
["num_for_nothing"]="Xwhc" ["num_for_nothing"]="Xwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -747,6 +803,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=900, ["num"]=900,
["num_for_nothing"]="Xwhc" ["num_for_nothing"]="Xwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -781,14 +845,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -840,6 +896,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -919,6 +983,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1000, ["num"]=1000,
["num_for_nothing"]="VwhcAw==" ["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -953,14 +1025,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -1012,6 +1076,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1100, ["num"]=1100,
["num_for_nothing"]="VwlcAw==" ["num_for_nothing"]="VwlcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1046,14 +1118,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -1105,6 +1169,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1100, ["num"]=1100,
["num_for_nothing"]="VwlcAw==" ["num_for_nothing"]="VwlcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1184,6 +1256,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1200, ["num"]=1200,
["num_for_nothing"]="VwpcAw==" ["num_for_nothing"]="VwpcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1277,6 +1357,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1200, ["num"]=1200,
["num_for_nothing"]="VwpcAw==" ["num_for_nothing"]="VwpcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1311,14 +1399,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -1370,6 +1450,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1300, ["num"]=1300,
["num_for_nothing"]="VwtcAw==" ["num_for_nothing"]="VwtcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1404,14 +1492,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -1463,6 +1543,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1300, ["num"]=1300,
["num_for_nothing"]="VwtcAw==" ["num_for_nothing"]="VwtcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1497,14 +1585,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -1556,6 +1636,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1400, ["num"]=1400,
["num_for_nothing"]="VwxcAw==" ["num_for_nothing"]="VwxcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1590,14 +1678,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
@ -1649,6 +1729,14 @@ local chapter_dungeon_equip = {
["id_for_nothing"]="Vw==", ["id_for_nothing"]="Vw==",
["num"]=1400, ["num"]=1400,
["num_for_nothing"]="VwxcAw==" ["num_for_nothing"]="VwxcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
["rand_drop"]={ ["rand_drop"]={
@ -1683,14 +1771,6 @@ local chapter_dungeon_equip = {
}, },
["bao_drop_num"]=2, ["bao_drop_num"]=2,
["item_show"]={ ["item_show"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",

120
lua/app/config/chapter_dungeon_gold.lua
View File

@ -33,6 +33,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[2]={ [2]={
@ -69,6 +77,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[3]={ [3]={
@ -105,6 +121,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[4]={ [4]={
@ -141,6 +165,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[5]={ [5]={
@ -177,6 +209,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[6]={ [6]={
@ -213,6 +253,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[7]={ [7]={
@ -249,6 +297,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[8]={ [8]={
@ -285,6 +341,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[9]={ [9]={
@ -321,6 +385,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[10]={ [10]={
@ -357,6 +429,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[11]={ [11]={
@ -393,6 +473,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[12]={ [12]={
@ -429,6 +517,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[13]={ [13]={
@ -465,6 +561,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[14]={ [14]={
@ -501,6 +605,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
}, },
[15]={ [15]={
@ -537,6 +649,14 @@ local chapter_dungeon_gold = {
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
},
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
} }
} }
} }

150
lua/app/config/chapter_dungeon_shards.lua
View File

@ -362,7 +362,15 @@ local chapter_dungeon_shards = {
["weight"]=400 ["weight"]=400
} }
}, },
["times_d"]=3 ["times_d"]=3,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[2]={ [2]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -727,7 +735,15 @@ local chapter_dungeon_shards = {
["weight"]=500 ["weight"]=500
} }
}, },
["times_d"]=5 ["times_d"]=5,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[3]={ [3]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -1092,7 +1108,15 @@ local chapter_dungeon_shards = {
["weight"]=500 ["weight"]=500
} }
}, },
["times_d"]=2 ["times_d"]=2,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[4]={ [4]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -1457,7 +1481,15 @@ local chapter_dungeon_shards = {
["weight"]=500 ["weight"]=500
} }
}, },
["times_d"]=4 ["times_d"]=4,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[5]={ [5]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -1822,7 +1854,15 @@ local chapter_dungeon_shards = {
["weight"]=550 ["weight"]=550
} }
}, },
["times_d"]=6 ["times_d"]=6,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[6]={ [6]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -2187,7 +2227,15 @@ local chapter_dungeon_shards = {
["weight"]=600 ["weight"]=600
} }
}, },
["times_d"]=3 ["times_d"]=3,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[7]={ [7]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -2552,7 +2600,15 @@ local chapter_dungeon_shards = {
["weight"]=600 ["weight"]=600
} }
}, },
["times_d"]=5 ["times_d"]=5,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[8]={ [8]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -2977,7 +3033,15 @@ local chapter_dungeon_shards = {
["weight"]=5 ["weight"]=5
} }
}, },
["times_d"]=7 ["times_d"]=7,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[9]={ [9]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -3402,7 +3466,15 @@ local chapter_dungeon_shards = {
["weight"]=8 ["weight"]=8
} }
}, },
["times_d"]=4 ["times_d"]=4,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[10]={ [10]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -3827,7 +3899,15 @@ local chapter_dungeon_shards = {
["weight"]=10 ["weight"]=10
} }
}, },
["times_d"]=6 ["times_d"]=6,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[11]={ [11]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -4252,7 +4332,15 @@ local chapter_dungeon_shards = {
["weight"]=10 ["weight"]=10
} }
}, },
["times_d"]=8 ["times_d"]=8,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[12]={ [12]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -4677,7 +4765,15 @@ local chapter_dungeon_shards = {
["weight"]=20 ["weight"]=20
} }
}, },
["times_d"]=5 ["times_d"]=5,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[13]={ [13]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -5102,7 +5198,15 @@ local chapter_dungeon_shards = {
["weight"]=18 ["weight"]=18
} }
}, },
["times_d"]=7 ["times_d"]=7,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[14]={ [14]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -5527,7 +5631,15 @@ local chapter_dungeon_shards = {
["weight"]=35 ["weight"]=35
} }
}, },
["times_d"]=4 ["times_d"]=4,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}, },
[15]={ [15]={
["scene"]="bg_debris", ["scene"]="bg_debris",
@ -5952,7 +6064,15 @@ local chapter_dungeon_shards = {
["weight"]=30 ["weight"]=30
} }
}, },
["times_d"]=6 ["times_d"]=6,
["exp_reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
} }
} }
local config = { local config = {

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

@ -5,6 +5,7 @@ local grid_type = {
[1]={ [1]={
["icon"]="battle_hinder_1", ["icon"]="battle_hinder_1",
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1 ["element_invalid"]=1
}, },
[2]={ [2]={
@ -16,6 +17,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_za_b01"
}, },
@ -28,6 +30,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_za_b01" ["break_sfx"]="sfx_piece_za_b01"
}, },
@ -39,6 +42,7 @@ local grid_type = {
3 3
}, },
["break_count"]=1, ["break_count"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b03" ["break_sfx"]="sfx_piece_za_b03"
}, },
[5]={ [5]={
@ -51,6 +55,7 @@ local grid_type = {
["break_count"]=1, ["break_count"]=1,
["break_stay_element"]=1, ["break_stay_element"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_za_b02" ["break_sfx"]="sfx_piece_za_b02"
}, },
[6]={ [6]={
@ -68,6 +73,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_zhuqiantk_b01" ["break_sfx"]="sfx_piece_zhuqiantk_b01"
}, },
@ -80,6 +86,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=1, ["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01", ["effect_sfx"]="sfx_piece_huojian_b01",
@ -98,6 +105,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=1, ["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01", ["effect_sfx"]="sfx_piece_huojian_b01",
@ -116,6 +124,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=1, ["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01", ["effect_sfx"]="sfx_piece_huojian_b01",
@ -134,6 +143,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["effect"]=1, ["effect"]=1,
["effect_sfx"]="sfx_piece_huojian_b01", ["effect_sfx"]="sfx_piece_huojian_b01",
@ -154,6 +164,7 @@ local grid_type = {
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_kucao_b01" ["break_sfx"]="sfx_piece_kucao_b01"
}, },
[13]={ [13]={
@ -167,6 +178,7 @@ local grid_type = {
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_guodong_b01", ["break_sfx"]="sfx_piece_guodong_b01",
["effect"]=5, ["effect"]=5,
@ -185,6 +197,7 @@ local grid_type = {
["bftc_icon"]="battle_obstacle_lamp", ["bftc_icon"]="battle_obstacle_lamp",
["bftc_time"]=0.4, ["bftc_time"]=0.4,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_shendeng_b01", ["break_sfx"]="sfx_piece_shendeng_b01",
["effect"]=3, ["effect"]=3,
@ -206,6 +219,7 @@ local grid_type = {
["bftc_icon"]="battle_obstacle_chest_4", ["bftc_icon"]="battle_obstacle_chest_4",
["bftc_time"]=0.3, ["bftc_time"]=0.3,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_baoxiang_b01", ["break_sfx"]="sfx_piece_baoxiang_b01",
["effect"]=4, ["effect"]=4,
@ -224,6 +238,7 @@ local grid_type = {
["spine_change"]="idle1_1", ["spine_change"]="idle1_1",
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1 ["element_invalid"]=1
}, },
[17]={ [17]={
@ -239,6 +254,7 @@ local grid_type = {
["spine_change"]="idle1", ["spine_change"]="idle1",
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1 ["element_invalid"]=1
}, },
[18]={ [18]={
@ -250,6 +266,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_muzhuang_b01" ["break_sfx"]="sfx_piece_muzhuang_b01"
}, },
@ -262,6 +279,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_muzhuang_b01" ["break_sfx"]="sfx_piece_muzhuang_b01"
}, },
@ -274,6 +292,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_muzhuang_b01" ["break_sfx"]="sfx_piece_muzhuang_b01"
}, },
@ -288,6 +307,7 @@ local grid_type = {
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_shuipao_b01", ["break_sfx"]="sfx_piece_shuipao_b01",
["effect"]=5, ["effect"]=5,
@ -305,6 +325,7 @@ local grid_type = {
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_yuni_b01", ["break_sfx"]="sfx_piece_yuni_b01",
["effect"]=5, ["effect"]=5,
@ -322,6 +343,7 @@ local grid_type = {
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_duwu_b01", ["break_sfx"]="sfx_piece_duwu_b01",
["effect"]=5, ["effect"]=5,
@ -337,6 +359,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_jitang_b01" ["break_sfx"]="sfx_piece_jitang_b01"
}, },
@ -349,6 +372,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_jitang_b01" ["break_sfx"]="sfx_piece_jitang_b01"
}, },
@ -361,6 +385,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_jitang_b01" ["break_sfx"]="sfx_piece_jitang_b01"
}, },
@ -372,6 +397,7 @@ local grid_type = {
3 3
}, },
["break_count"]=1, ["break_count"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_fazhen_b01" ["break_sfx"]="sfx_piece_fazhen_b01"
}, },
[28]={ [28]={
@ -383,6 +409,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_zhongrushi_b01" ["break_sfx"]="sfx_piece_zhongrushi_b01"
}, },
@ -395,6 +422,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_zhongrushi_b01" ["break_sfx"]="sfx_piece_zhongrushi_b01"
}, },
@ -407,6 +435,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_zhongrushi_b01" ["break_sfx"]="sfx_piece_zhongrushi_b01"
}, },
@ -419,6 +448,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_tiexie_b01" ["break_sfx"]="sfx_piece_tiexie_b01"
}, },
@ -431,6 +461,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_tiexie_b01" ["break_sfx"]="sfx_piece_tiexie_b01"
}, },
@ -443,6 +474,7 @@ local grid_type = {
}, },
["break_count"]=1, ["break_count"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_tiexie_b01" ["break_sfx"]="sfx_piece_tiexie_b01"
}, },
@ -457,6 +489,7 @@ local grid_type = {
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_rongyan_b01", ["break_sfx"]="sfx_piece_rongyan_b01",
["effect"]=5, ["effect"]=5,
@ -474,6 +507,7 @@ local grid_type = {
["break_stay_element"]=1, ["break_stay_element"]=1,
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["break_sfx"]="sfx_piece_caocong_b01" ["break_sfx"]="sfx_piece_caocong_b01"
}, },
[36]={ [36]={
@ -484,6 +518,7 @@ local grid_type = {
["spine_idle"]="idle", ["spine_idle"]="idle",
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_rongyan_b01", ["break_sfx"]="sfx_piece_rongyan_b01",
["effect"]=6, ["effect"]=6,
@ -497,6 +532,7 @@ local grid_type = {
["spine_idle"]="idle", ["spine_idle"]="idle",
["can_fall"]=1, ["can_fall"]=1,
["cant_link"]=1, ["cant_link"]=1,
["cant_upset"]=1,
["element_invalid"]=1, ["element_invalid"]=1,
["break_sfx"]="sfx_piece_duwu_b01", ["break_sfx"]="sfx_piece_duwu_b01",
["effect"]=6, ["effect"]=6,

516
lua/app/config/mall_daily.lua
View File

@ -1420,6 +1420,86 @@ local mall_daily = {
["id_for_nothing"]="UwtcA2c=", ["id_for_nothing"]="UwtcA2c=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=14001,
["id_for_nothing"]="VwxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=14002,
["id_for_nothing"]="VwxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=24001,
["id_for_nothing"]="VAxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=24002,
["id_for_nothing"]="VAxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=34001,
["id_for_nothing"]="VQxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=34002,
["id_for_nothing"]="VQxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44001,
["id_for_nothing"]="UgxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44002,
["id_for_nothing"]="UgxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=54001,
["id_for_nothing"]="UwxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=54002,
["id_for_nothing"]="UwxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
} }
}, },
["weight"]={ ["weight"]={
@ -1467,7 +1547,17 @@ local mall_daily = {
5, 5,
5, 5,
5, 5,
5 5,
32,
32,
32,
32,
32,
32,
32,
32,
32,
32
}, },
["cost"]={ ["cost"]={
{ {
@ -1829,6 +1919,86 @@ local mall_daily = {
["id_for_nothing"]="VA==", ["id_for_nothing"]="VA==",
["num"]=30, ["num"]=30,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
} }
}, },
@ -2193,6 +2363,86 @@ local mall_daily = {
["id_for_nothing"]="UwtcA2c=", ["id_for_nothing"]="UwtcA2c=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=14001,
["id_for_nothing"]="VwxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=14002,
["id_for_nothing"]="VwxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=24001,
["id_for_nothing"]="VAxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=24002,
["id_for_nothing"]="VAxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=34001,
["id_for_nothing"]="VQxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=34002,
["id_for_nothing"]="VQxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44001,
["id_for_nothing"]="UgxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44002,
["id_for_nothing"]="UgxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=54001,
["id_for_nothing"]="UwxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=54002,
["id_for_nothing"]="UwxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
} }
}, },
["weight"]={ ["weight"]={
@ -2240,7 +2490,17 @@ local mall_daily = {
5, 5,
5, 5,
5, 5,
5 5,
32,
32,
32,
32,
32,
32,
32,
32,
32,
32
}, },
["cost"]={ ["cost"]={
{ {
@ -2602,6 +2862,86 @@ local mall_daily = {
["id_for_nothing"]="VA==", ["id_for_nothing"]="VA==",
["num"]=30, ["num"]=30,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
} }
}, },
@ -2966,6 +3306,86 @@ local mall_daily = {
["id_for_nothing"]="UwtcA2c=", ["id_for_nothing"]="UwtcA2c=",
["num"]=6, ["num"]=6,
["num_for_nothing"]="UA==" ["num_for_nothing"]="UA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=14001,
["id_for_nothing"]="VwxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=14002,
["id_for_nothing"]="VwxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=24001,
["id_for_nothing"]="VAxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=24002,
["id_for_nothing"]="VAxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=34001,
["id_for_nothing"]="VQxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=34002,
["id_for_nothing"]="VQxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44001,
["id_for_nothing"]="UgxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44002,
["id_for_nothing"]="UgxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=54001,
["id_for_nothing"]="UwxcA2Q=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=54002,
["id_for_nothing"]="UwxcA2c=",
["num"]=1,
["num_for_nothing"]="Vw=="
} }
}, },
["weight"]={ ["weight"]={
@ -3013,7 +3433,17 @@ local mall_daily = {
5, 5,
5, 5,
5, 5,
5 5,
32,
32,
32,
32,
32,
32,
32,
32,
32,
32
}, },
["cost"]={ ["cost"]={
{ {
@ -3375,6 +3805,86 @@ local mall_daily = {
["id_for_nothing"]="VA==", ["id_for_nothing"]="VA==",
["num"]=30, ["num"]=30,
["num_for_nothing"]="VQg=" ["num_for_nothing"]="VQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
} }
} }

1711
lua/app/config/monster_chapter.lua
View File

File diff suppressed because it is too large Load Diff

504
lua/app/config/monster_daily_challenge.lua
View File

File diff suppressed because it is too large Load Diff

1200
lua/app/config/monster_dungeon_armor.lua
View File

File diff suppressed because it is too large Load Diff

200
lua/app/config/monster_dungeon_equip.lua
View File

@ -2,7 +2,7 @@ local monster_dungeon_equip = {
[106]={ [106]={
["monster_base"]=10056, ["monster_base"]=10056,
["hp"]=76930000, ["hp"]=76930000,
["atk"]=1600000, ["atk"]=1390000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20163, 20163,
@ -17,7 +17,7 @@ local monster_dungeon_equip = {
[206]={ [206]={
["monster_base"]=10045, ["monster_base"]=10045,
["hp"]=93400000, ["hp"]=93400000,
["atk"]=2150000, ["atk"]=1930000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20130, 20130,
@ -32,7 +32,7 @@ local monster_dungeon_equip = {
[306]={ [306]={
["monster_base"]=10028, ["monster_base"]=10028,
["hp"]=153020000, ["hp"]=153020000,
["atk"]=2260000, ["atk"]=2140000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20079, 20079,
@ -47,7 +47,7 @@ local monster_dungeon_equip = {
[406]={ [406]={
["monster_base"]=10003, ["monster_base"]=10003,
["hp"]=203320000, ["hp"]=203320000,
["atk"]=2320000, ["atk"]=2220000,
["atk_times"]=2, ["atk_times"]=2,
["hurt_skill"]={ ["hurt_skill"]={
20007, 20007,
@ -63,7 +63,7 @@ local monster_dungeon_equip = {
["monster_base"]=20041, ["monster_base"]=20041,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=386900000, ["hp"]=386900000,
["atk"]=2400000, ["atk"]=2260000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30126, 30126,
@ -83,7 +83,7 @@ local monster_dungeon_equip = {
[606]={ [606]={
["monster_base"]=10060, ["monster_base"]=10060,
["hp"]=85320000, ["hp"]=85320000,
["atk"]=1810000, ["atk"]=1540000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20175, 20175,
@ -98,7 +98,7 @@ local monster_dungeon_equip = {
[706]={ [706]={
["monster_base"]=10055, ["monster_base"]=10055,
["hp"]=103120000, ["hp"]=103120000,
["atk"]=2400000, ["atk"]=2150000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20160, 20160,
@ -113,7 +113,7 @@ local monster_dungeon_equip = {
[806]={ [806]={
["monster_base"]=10027, ["monster_base"]=10027,
["hp"]=168890000, ["hp"]=168890000,
["atk"]=2540000, ["atk"]=2380000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20076, 20076,
@ -128,7 +128,7 @@ local monster_dungeon_equip = {
[906]={ [906]={
["monster_base"]=10064, ["monster_base"]=10064,
["hp"]=224600000, ["hp"]=224600000,
["atk"]=2590000, ["atk"]=2470000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20190, 20190,
@ -144,7 +144,7 @@ local monster_dungeon_equip = {
["monster_base"]=20040, ["monster_base"]=20040,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=426150000, ["hp"]=426150000,
["atk"]=2650000, ["atk"]=2520000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30114, 30114,
@ -163,7 +163,7 @@ local monster_dungeon_equip = {
[1106]={ [1106]={
["monster_base"]=10015, ["monster_base"]=10015,
["hp"]=93300000, ["hp"]=93300000,
["atk"]=2000000, ["atk"]=1680000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20040, 20040,
@ -178,7 +178,7 @@ local monster_dungeon_equip = {
[1206]={ [1206]={
["monster_base"]=10025, ["monster_base"]=10025,
["hp"]=112820000, ["hp"]=112820000,
["atk"]=2670000, ["atk"]=2340000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20070, 20070,
@ -193,7 +193,7 @@ local monster_dungeon_equip = {
[1306]={ [1306]={
["monster_base"]=10030, ["monster_base"]=10030,
["hp"]=191790000, ["hp"]=191790000,
["atk"]=2910000, ["atk"]=2590000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20085, 20085,
@ -208,7 +208,7 @@ local monster_dungeon_equip = {
[1406]={ [1406]={
["monster_base"]=10018, ["monster_base"]=10018,
["hp"]=255070000, ["hp"]=255070000,
["atk"]=2990000, ["atk"]=2690000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20049, 20049,
@ -224,7 +224,7 @@ local monster_dungeon_equip = {
["monster_base"]=20039, ["monster_base"]=20039,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=494490000, ["hp"]=494490000,
["atk"]=3100000, ["atk"]=2740000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30117, 30117,
@ -243,7 +243,7 @@ local monster_dungeon_equip = {
[1606]={ [1606]={
["monster_base"]=10004, ["monster_base"]=10004,
["hp"]=119700000, ["hp"]=119700000,
["atk"]=2670000, ["atk"]=1830000,
["atk_times"]=2, ["atk_times"]=2,
["hurt_skill"]={ ["hurt_skill"]={
20010, 20010,
@ -258,7 +258,7 @@ local monster_dungeon_equip = {
[1706]={ [1706]={
["monster_base"]=10049, ["monster_base"]=10049,
["hp"]=143630000, ["hp"]=143630000,
["atk"]=3500000, ["atk"]=2540000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20142, 20142,
@ -273,7 +273,7 @@ local monster_dungeon_equip = {
[1806]={ [1806]={
["monster_base"]=10037, ["monster_base"]=10037,
["hp"]=235050000, ["hp"]=235050000,
["atk"]=3660000, ["atk"]=2810000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20106, 20106,
@ -288,7 +288,7 @@ local monster_dungeon_equip = {
[1906]={ [1906]={
["monster_base"]=10016, ["monster_base"]=10016,
["hp"]=312870000, ["hp"]=312870000,
["atk"]=3760000, ["atk"]=2920000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20043, 20043,
@ -304,7 +304,7 @@ local monster_dungeon_equip = {
["monster_base"]=20043, ["monster_base"]=20043,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=566760000, ["hp"]=566760000,
["atk"]=3630000, ["atk"]=2980000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30120, 30120,
@ -324,7 +324,7 @@ local monster_dungeon_equip = {
[2106]={ [2106]={
["monster_base"]=10022, ["monster_base"]=10022,
["hp"]=136880000, ["hp"]=136880000,
["atk"]=3150000, ["atk"]=2010000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20061, 20061,
@ -339,7 +339,7 @@ local monster_dungeon_equip = {
[2206]={ [2206]={
["monster_base"]=10032, ["monster_base"]=10032,
["hp"]=163040000, ["hp"]=163040000,
["atk"]=4110000, ["atk"]=2780000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20091, 20091,
@ -354,7 +354,7 @@ local monster_dungeon_equip = {
[2306]={ [2306]={
["monster_base"]=10013, ["monster_base"]=10013,
["hp"]=267170000, ["hp"]=267170000,
["atk"]=4270000, ["atk"]=3070000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20034, 20034,
@ -369,7 +369,7 @@ local monster_dungeon_equip = {
[2406]={ [2406]={
["monster_base"]=10001, ["monster_base"]=10001,
["hp"]=355450000, ["hp"]=355450000,
["atk"]=4410000, ["atk"]=3200000,
["atk_times"]=2, ["atk_times"]=2,
["hurt_skill"]={ ["hurt_skill"]={
20001, 20001,
@ -385,7 +385,7 @@ local monster_dungeon_equip = {
["monster_base"]=20042, ["monster_base"]=20042,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=643710000, ["hp"]=643710000,
["atk"]=4220000, ["atk"]=3260000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30123, 30123,
@ -404,7 +404,7 @@ local monster_dungeon_equip = {
[2606]={ [2606]={
["monster_base"]=10045, ["monster_base"]=10045,
["hp"]=147550000, ["hp"]=147550000,
["atk"]=3510000, ["atk"]=2190000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20130, 20130,
@ -419,7 +419,7 @@ local monster_dungeon_equip = {
[2706]={ [2706]={
["monster_base"]=10056, ["monster_base"]=10056,
["hp"]=175200000, ["hp"]=175200000,
["atk"]=4510000, ["atk"]=3030000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20163, 20163,
@ -434,7 +434,7 @@ local monster_dungeon_equip = {
[2806]={ [2806]={
["monster_base"]=10003, ["monster_base"]=10003,
["hp"]=287270000, ["hp"]=287270000,
["atk"]=4700000, ["atk"]=3340000,
["atk_times"]=2, ["atk_times"]=2,
["hurt_skill"]={ ["hurt_skill"]={
20007, 20007,
@ -449,7 +449,7 @@ local monster_dungeon_equip = {
[2906]={ [2906]={
["monster_base"]=10028, ["monster_base"]=10028,
["hp"]=382140000, ["hp"]=382140000,
["atk"]=4860000, ["atk"]=3490000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20079, 20079,
@ -465,7 +465,7 @@ local monster_dungeon_equip = {
["monster_base"]=20041, ["monster_base"]=20041,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=691660000, ["hp"]=691660000,
["atk"]=4620000, ["atk"]=3560000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30126, 30126,
@ -485,7 +485,7 @@ local monster_dungeon_equip = {
[3106]={ [3106]={
["monster_base"]=10052, ["monster_base"]=10052,
["hp"]=161570000, ["hp"]=161570000,
["atk"]=3940000, ["atk"]=2380000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20151, 20151,
@ -500,7 +500,7 @@ local monster_dungeon_equip = {
[3206]={ [3206]={
["monster_base"]=10062, ["monster_base"]=10062,
["hp"]=191650000, ["hp"]=191650000,
["atk"]=5040000, ["atk"]=3300000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20181, 20181,
@ -515,7 +515,7 @@ local monster_dungeon_equip = {
[3306]={ [3306]={
["monster_base"]=10036, ["monster_base"]=10036,
["hp"]=313710000, ["hp"]=313710000,
["atk"]=5250000, ["atk"]=3620000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20103, 20103,
@ -530,7 +530,7 @@ local monster_dungeon_equip = {
[3406]={ [3406]={
["monster_base"]=10061, ["monster_base"]=10061,
["hp"]=417370000, ["hp"]=417370000,
["atk"]=5400000, ["atk"]=3790000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20178, 20178,
@ -546,7 +546,7 @@ local monster_dungeon_equip = {
["monster_base"]=20040, ["monster_base"]=20040,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=754850000, ["hp"]=754850000,
["atk"]=5120000, ["atk"]=3870000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30129, 30129,
@ -565,7 +565,7 @@ local monster_dungeon_equip = {
[3606]={ [3606]={
["monster_base"]=10030, ["monster_base"]=10030,
["hp"]=175230000, ["hp"]=175230000,
["atk"]=4360000, ["atk"]=2580000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20085, 20085,
@ -580,7 +580,7 @@ local monster_dungeon_equip = {
[3706]={ [3706]={
["monster_base"]=10015, ["monster_base"]=10015,
["hp"]=207360000, ["hp"]=207360000,
["atk"]=5570000, ["atk"]=3560000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20040, 20040,
@ -595,7 +595,7 @@ local monster_dungeon_equip = {
[3806]={ [3806]={
["monster_base"]=10025, ["monster_base"]=10025,
["hp"]=338580000, ["hp"]=338580000,
["atk"]=5780000, ["atk"]=3900000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20070, 20070,
@ -610,7 +610,7 @@ local monster_dungeon_equip = {
[3906]={ [3906]={
["monster_base"]=10034, ["monster_base"]=10034,
["hp"]=450950000, ["hp"]=450950000,
["atk"]=5930000, ["atk"]=4090000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20097, 20097,
@ -626,7 +626,7 @@ local monster_dungeon_equip = {
["monster_base"]=20039, ["monster_base"]=20039,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=814970000, ["hp"]=814970000,
["atk"]=5600000, ["atk"]=4170000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30117, 30117,
@ -645,7 +645,7 @@ local monster_dungeon_equip = {
[4106]={ [4106]={
["monster_base"]=10054, ["monster_base"]=10054,
["hp"]=182360000, ["hp"]=182360000,
["atk"]=4590000, ["atk"]=2660000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20157, 20157,
@ -660,7 +660,7 @@ local monster_dungeon_equip = {
[4206]={ [4206]={
["monster_base"]=10037, ["monster_base"]=10037,
["hp"]=215460000, ["hp"]=215460000,
["atk"]=5830000, ["atk"]=3660000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20106, 20106,
@ -675,7 +675,7 @@ local monster_dungeon_equip = {
[4306]={ [4306]={
["monster_base"]=10012, ["monster_base"]=10012,
["hp"]=351510000, ["hp"]=351510000,
["atk"]=6040000, ["atk"]=4010000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20031, 20031,
@ -690,7 +690,7 @@ local monster_dungeon_equip = {
[4406]={ [4406]={
["monster_base"]=10049, ["monster_base"]=10049,
["hp"]=468340000, ["hp"]=468340000,
["atk"]=6220000, ["atk"]=4210000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20142, 20142,
@ -706,7 +706,7 @@ local monster_dungeon_equip = {
["monster_base"]=20043, ["monster_base"]=20043,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=846340000, ["hp"]=846340000,
["atk"]=5860000, ["atk"]=4290000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30120, 30120,
@ -726,7 +726,7 @@ local monster_dungeon_equip = {
[4606]={ [4606]={
["monster_base"]=10042, ["monster_base"]=10042,
["hp"]=187110000, ["hp"]=187110000,
["atk"]=4750000, ["atk"]=2740000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20121, 20121,
@ -741,7 +741,7 @@ local monster_dungeon_equip = {
[4706]={ [4706]={
["monster_base"]=10026, ["monster_base"]=10026,
["hp"]=220970000, ["hp"]=220970000,
["atk"]=6040000, ["atk"]=3780000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20073, 20073,
@ -756,7 +756,7 @@ local monster_dungeon_equip = {
[4806]={ [4806]={
["monster_base"]=10019, ["monster_base"]=10019,
["hp"]=360430000, ["hp"]=360430000,
["atk"]=6240000, ["atk"]=4140000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20052, 20052,
@ -771,7 +771,7 @@ local monster_dungeon_equip = {
[4906]={ [4906]={
["monster_base"]=10001, ["monster_base"]=10001,
["hp"]=480060000, ["hp"]=480060000,
["atk"]=6450000, ["atk"]=4340000,
["atk_times"]=2, ["atk_times"]=2,
["hurt_skill"]={ ["hurt_skill"]={
20001, 20001,
@ -787,7 +787,7 @@ local monster_dungeon_equip = {
["monster_base"]=20042, ["monster_base"]=20042,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=867510000, ["hp"]=867510000,
["atk"]=6040000, ["atk"]=4430000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30132, 30132,
@ -806,7 +806,7 @@ local monster_dungeon_equip = {
[5106]={ [5106]={
["monster_base"]=10045, ["monster_base"]=10045,
["hp"]=200880000, ["hp"]=200880000,
["atk"]=5180000, ["atk"]=2910000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20130, 20130,
@ -821,7 +821,7 @@ local monster_dungeon_equip = {
[5206]={ [5206]={
["monster_base"]=10056, ["monster_base"]=10056,
["hp"]=236460000, ["hp"]=236460000,
["atk"]=6550000, ["atk"]=4010000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20163, 20163,
@ -836,7 +836,7 @@ local monster_dungeon_equip = {
[5306]={ [5306]={
["monster_base"]=10003, ["monster_base"]=10003,
["hp"]=385650000, ["hp"]=385650000,
["atk"]=6780000, ["atk"]=4400000,
["atk_times"]=2, ["atk_times"]=2,
["hurt_skill"]={ ["hurt_skill"]={
20007, 20007,
@ -851,7 +851,7 @@ local monster_dungeon_equip = {
[5406]={ [5406]={
["monster_base"]=10028, ["monster_base"]=10028,
["hp"]=513230000, ["hp"]=513230000,
["atk"]=6990000, ["atk"]=4600000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20079, 20079,
@ -867,7 +867,7 @@ local monster_dungeon_equip = {
["monster_base"]=20041, ["monster_base"]=20041,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=927400000, ["hp"]=927400000,
["atk"]=6550000, ["atk"]=4690000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30126, 30126,
@ -887,7 +887,7 @@ local monster_dungeon_equip = {
[5606]={ [5606]={
["monster_base"]=10029, ["monster_base"]=10029,
["hp"]=202710000, ["hp"]=202710000,
["atk"]=5270000, ["atk"]=2990000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20082, 20082,
@ -902,7 +902,7 @@ local monster_dungeon_equip = {
[5706]={ [5706]={
["monster_base"]=10055, ["monster_base"]=10055,
["hp"]=238240000, ["hp"]=238240000,
["atk"]=6650000, ["atk"]=4130000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20160, 20160,
@ -917,7 +917,7 @@ local monster_dungeon_equip = {
[5806]={ [5806]={
["monster_base"]=10051, ["monster_base"]=10051,
["hp"]=388530000, ["hp"]=388530000,
["atk"]=6880000, ["atk"]=4530000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20148, 20148,
@ -932,7 +932,7 @@ local monster_dungeon_equip = {
[5906]={ [5906]={
["monster_base"]=10064, ["monster_base"]=10064,
["hp"]=517080000, ["hp"]=517080000,
["atk"]=7080000, ["atk"]=4730000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20190, 20190,
@ -948,7 +948,7 @@ local monster_dungeon_equip = {
["monster_base"]=20040, ["monster_base"]=20040,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=933980000, ["hp"]=933980000,
["atk"]=6630000, ["atk"]=4820000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30135, 30135,
@ -967,7 +967,7 @@ local monster_dungeon_equip = {
[6106]={ [6106]={
["monster_base"]=10015, ["monster_base"]=10015,
["hp"]=216480000, ["hp"]=216480000,
["atk"]=5750000, ["atk"]=3180000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20040, 20040,
@ -982,7 +982,7 @@ local monster_dungeon_equip = {
[6206]={ [6206]={
["monster_base"]=10025, ["monster_base"]=10025,
["hp"]=254320000, ["hp"]=254320000,
["atk"]=7200000, ["atk"]=4380000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20070, 20070,
@ -997,7 +997,7 @@ local monster_dungeon_equip = {
[6306]={ [6306]={
["monster_base"]=10021, ["monster_base"]=10021,
["hp"]=415070000, ["hp"]=415070000,
["atk"]=7450000, ["atk"]=4810000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20058, 20058,
@ -1012,7 +1012,7 @@ local monster_dungeon_equip = {
[6406]={ [6406]={
["monster_base"]=10034, ["monster_base"]=10034,
["hp"]=552120000, ["hp"]=552120000,
["atk"]=7670000, ["atk"]=5030000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20097, 20097,
@ -1028,7 +1028,7 @@ local monster_dungeon_equip = {
["monster_base"]=20039, ["monster_base"]=20039,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=996810000, ["hp"]=996810000,
["atk"]=7150000, ["atk"]=5130000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30117, 30117,
@ -1047,7 +1047,7 @@ local monster_dungeon_equip = {
[6606]={ [6606]={
["monster_base"]=10049, ["monster_base"]=10049,
["hp"]=221080000, ["hp"]=221080000,
["atk"]=5900000, ["atk"]=3280000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20142, 20142,
@ -1062,7 +1062,7 @@ local monster_dungeon_equip = {
[6706]={ [6706]={
["monster_base"]=10006, ["monster_base"]=10006,
["hp"]=259330000, ["hp"]=259330000,
["atk"]=7400000, ["atk"]=4500000,
["atk_times"]=2, ["atk_times"]=2,
["hurt_skill"]={ ["hurt_skill"]={
20016, 20016,
@ -1077,7 +1077,7 @@ local monster_dungeon_equip = {
[6806]={ [6806]={
["monster_base"]=10054, ["monster_base"]=10054,
["hp"]=423100000, ["hp"]=423100000,
["atk"]=7640000, ["atk"]=4950000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20157, 20157,
@ -1092,7 +1092,7 @@ local monster_dungeon_equip = {
[6906]={ [6906]={
["monster_base"]=10024, ["monster_base"]=10024,
["hp"]=562720000, ["hp"]=562720000,
["atk"]=7870000, ["atk"]=5180000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20067, 20067,
@ -1108,7 +1108,7 @@ local monster_dungeon_equip = {
["monster_base"]=20043, ["monster_base"]=20043,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=1015810000, ["hp"]=1015810000,
["atk"]=7320000, ["atk"]=5280000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30120, 30120,
@ -1128,7 +1128,7 @@ local monster_dungeon_equip = {
[7106]={ [7106]={
["monster_base"]=10019, ["monster_base"]=10019,
["hp"]=225650000, ["hp"]=225650000,
["atk"]=6080000, ["atk"]=3370000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20052, 20052,
@ -1143,7 +1143,7 @@ local monster_dungeon_equip = {
[7206]={ [7206]={
["monster_base"]=10035, ["monster_base"]=10035,
["hp"]=264660000, ["hp"]=264660000,
["atk"]=7590000, ["atk"]=4630000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20100, 20100,
@ -1158,7 +1158,7 @@ local monster_dungeon_equip = {
[7306]={ [7306]={
["monster_base"]=10026, ["monster_base"]=10026,
["hp"]=431730000, ["hp"]=431730000,
["atk"]=7840000, ["atk"]=5090000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20073, 20073,
@ -1173,7 +1173,7 @@ local monster_dungeon_equip = {
[7406]={ [7406]={
["monster_base"]=10041, ["monster_base"]=10041,
["hp"]=574040000, ["hp"]=574040000,
["atk"]=8090000, ["atk"]=5330000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20118, 20118,
@ -1189,7 +1189,7 @@ local monster_dungeon_equip = {
["monster_base"]=20042, ["monster_base"]=20042,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=1036280000, ["hp"]=1036280000,
["atk"]=7520000, ["atk"]=5440000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30138, 30138,
@ -1208,7 +1208,7 @@ local monster_dungeon_equip = {
[7606]={ [7606]={
["monster_base"]=10053, ["monster_base"]=10053,
["hp"]=233950000, ["hp"]=233950000,
["atk"]=6420000, ["atk"]=3470000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20154, 20154,
@ -1223,7 +1223,7 @@ local monster_dungeon_equip = {
[7706]={ [7706]={
["monster_base"]=10043, ["monster_base"]=10043,
["hp"]=273880000, ["hp"]=273880000,
["atk"]=8000000, ["atk"]=4760000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20124, 20124,
@ -1238,7 +1238,7 @@ local monster_dungeon_equip = {
[7806]={ [7806]={
["monster_base"]=10033, ["monster_base"]=10033,
["hp"]=446810000, ["hp"]=446810000,
["atk"]=8270000, ["atk"]=5230000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20094, 20094,
@ -1253,7 +1253,7 @@ local monster_dungeon_equip = {
[7906]={ [7906]={
["monster_base"]=10028, ["monster_base"]=10028,
["hp"]=594050000, ["hp"]=594050000,
["atk"]=8510000, ["atk"]=5480000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20079, 20079,
@ -1269,7 +1269,7 @@ local monster_dungeon_equip = {
["monster_base"]=20041, ["monster_base"]=20041,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=1072430000, ["hp"]=1072430000,
["atk"]=7900000, ["atk"]=5590000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30126, 30126,
@ -1289,7 +1289,7 @@ local monster_dungeon_equip = {
[8106]={ [8106]={
["monster_base"]=10036, ["monster_base"]=10036,
["hp"]=132000000, ["hp"]=132000000,
["atk"]=990000, ["atk"]=870000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20103, 20103,
@ -1304,7 +1304,7 @@ local monster_dungeon_equip = {
[8206]={ [8206]={
["monster_base"]=10017, ["monster_base"]=10017,
["hp"]=284280000, ["hp"]=284280000,
["atk"]=8360000, ["atk"]=4890000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20046, 20046,
@ -1319,7 +1319,7 @@ local monster_dungeon_equip = {
[8306]={ [8306]={
["monster_base"]=10023, ["monster_base"]=10023,
["hp"]=463670000, ["hp"]=463670000,
["atk"]=8610000, ["atk"]=5380000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20064, 20064,
@ -1334,7 +1334,7 @@ local monster_dungeon_equip = {
[8406]={ [8406]={
["monster_base"]=10051, ["monster_base"]=10051,
["hp"]=616180000, ["hp"]=616180000,
["atk"]=8880000, ["atk"]=5640000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20148, 20148,
@ -1350,7 +1350,7 @@ local monster_dungeon_equip = {
["monster_base"]=20040, ["monster_base"]=20040,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=1112410000, ["hp"]=1112410000,
["atk"]=8240000, ["atk"]=5750000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30141, 30141,
@ -1369,7 +1369,7 @@ local monster_dungeon_equip = {
[8606]={ [8606]={
["monster_base"]=10021, ["monster_base"]=10021,
["hp"]=251150000, ["hp"]=251150000,
["atk"]=6970000, ["atk"]=3770000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20058, 20058,
@ -1384,7 +1384,7 @@ local monster_dungeon_equip = {
[8706]={ [8706]={
["monster_base"]=10034, ["monster_base"]=10034,
["hp"]=293630000, ["hp"]=293630000,
["atk"]=8680000, ["atk"]=5170000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20097, 20097,
@ -1399,7 +1399,7 @@ local monster_dungeon_equip = {
[8806]={ [8806]={
["monster_base"]=10030, ["monster_base"]=10030,
["hp"]=478890000, ["hp"]=478890000,
["atk"]=8940000, ["atk"]=5680000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20085, 20085,
@ -1414,7 +1414,7 @@ local monster_dungeon_equip = {
[8906]={ [8906]={
["monster_base"]=10018, ["monster_base"]=10018,
["hp"]=636450000, ["hp"]=636450000,
["atk"]=9230000, ["atk"]=5960000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20049, 20049,
@ -1430,7 +1430,7 @@ local monster_dungeon_equip = {
["monster_base"]=20039, ["monster_base"]=20039,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=1148710000, ["hp"]=1148710000,
["atk"]=8530000, ["atk"]=6080000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30117, 30117,
@ -1449,7 +1449,7 @@ local monster_dungeon_equip = {
[9106]={ [9106]={
["monster_base"]=10016, ["monster_base"]=10016,
["hp"]=261840000, ["hp"]=261840000,
["atk"]=7320000, ["atk"]=3970000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20043, 20043,
@ -1464,7 +1464,7 @@ local monster_dungeon_equip = {
[9206]={ [9206]={
["monster_base"]=10054, ["monster_base"]=10054,
["hp"]=305680000, ["hp"]=305680000,
["atk"]=9070000, ["atk"]=5440000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20157, 20157,
@ -1479,7 +1479,7 @@ local monster_dungeon_equip = {
[9306]={ [9306]={
["monster_base"]=10006, ["monster_base"]=10006,
["hp"]=498740000, ["hp"]=498740000,
["atk"]=9360000, ["atk"]=5980000,
["atk_times"]=2, ["atk_times"]=2,
["hurt_skill"]={ ["hurt_skill"]={
20016, 20016,
@ -1494,7 +1494,7 @@ local monster_dungeon_equip = {
[9406]={ [9406]={
["monster_base"]=10020, ["monster_base"]=10020,
["hp"]=662690000, ["hp"]=662690000,
["atk"]=9650000, ["atk"]=6280000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20055, 20055,
@ -1510,7 +1510,7 @@ local monster_dungeon_equip = {
["monster_base"]=20043, ["monster_base"]=20043,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=1196050000, ["hp"]=1196050000,
["atk"]=8930000, ["atk"]=6410000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30120, 30120,
@ -1530,7 +1530,7 @@ local monster_dungeon_equip = {
[9606]={ [9606]={
["monster_base"]=10031, ["monster_base"]=10031,
["hp"]=270070000, ["hp"]=270070000,
["atk"]=7580000, ["atk"]=4190000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20088, 20088,
@ -1545,7 +1545,7 @@ local monster_dungeon_equip = {
[9706]={ [9706]={
["monster_base"]=10035, ["monster_base"]=10035,
["hp"]=315240000, ["hp"]=315240000,
["atk"]=9410000, ["atk"]=5740000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20100, 20100,
@ -1560,7 +1560,7 @@ local monster_dungeon_equip = {
[9806]={ [9806]={
["monster_base"]=10019, ["monster_base"]=10019,
["hp"]=514070000, ["hp"]=514070000,
["atk"]=9700000, ["atk"]=6320000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20052, 20052,
@ -1575,7 +1575,7 @@ local monster_dungeon_equip = {
[9906]={ [9906]={
["monster_base"]=10013, ["monster_base"]=10013,
["hp"]=682910000, ["hp"]=682910000,
["atk"]=10010000, ["atk"]=6630000,
["atk_times"]=3, ["atk_times"]=3,
["hurt_skill"]={ ["hurt_skill"]={
20034, 20034,
@ -1591,7 +1591,7 @@ local monster_dungeon_equip = {
["monster_base"]=20042, ["monster_base"]=20042,
["is_boss"]=2, ["is_boss"]=2,
["hp"]=1232640000, ["hp"]=1232640000,
["atk"]=9240000, ["atk"]=6760000,
["atk_times"]=4, ["atk_times"]=4,
["hurt_skill"]={ ["hurt_skill"]={
30144, 30144,

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

@ -1252,7 +1252,7 @@ local skill = {
{ {
["type"]="stun", ["type"]="stun",
["num"]=0, ["num"]=0,
["ratio"]=10000, ["ratio"]=5000,
["round"]=2 ["round"]=2
} }
}, },
@ -2242,7 +2242,7 @@ local skill = {
["eliminate_effect"]={ ["eliminate_effect"]={
{ {
["type"]="dmg_addition_all_add", ["type"]="dmg_addition_all_add",
["num"]=5000, ["num"]=2000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
} }
@ -2855,8 +2855,8 @@ local skill = {
}, },
["pvp_effect"]={ ["pvp_effect"]={
{ {
["type"]="shield_rebound_200", ["type"]="shield_rebound_100",
["num"]=750, ["num"]=450,
["ratio"]=10000, ["ratio"]=10000,
["round"]=2 ["round"]=2
} }
@ -2891,8 +2891,8 @@ local skill = {
}, },
["pvp_effect"]={ ["pvp_effect"]={
{ {
["type"]="shield_rebound_400", ["type"]="shield_rebound_200",
["num"]=750, ["num"]=450,
["ratio"]=10000, ["ratio"]=10000,
["round"]=2 ["round"]=2
} }
@ -3478,7 +3478,7 @@ local skill = {
["eliminate_effect"]={ ["eliminate_effect"]={
{ {
["type"]="dmg_addition_all_add", ["type"]="dmg_addition_all_add",
["num"]=5000, ["num"]=2000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
} }
@ -4938,7 +4938,7 @@ local skill = {
["pvp_effect"]={ ["pvp_effect"]={
{ {
["type"]="shield_ice", ["type"]="shield_ice",
["num"]=750, ["num"]=375,
["ratio"]=10000, ["ratio"]=10000,
["round"]=2 ["round"]=2
} }
@ -4963,8 +4963,8 @@ local skill = {
}, },
["pvp_effect"]={ ["pvp_effect"]={
{ {
["type"]="shield_ice_rebound_400", ["type"]="shield_ice_rebound_200",
["num"]=750, ["num"]=375,
["ratio"]=10000, ["ratio"]=10000,
["round"]=2 ["round"]=2
} }
@ -6137,7 +6137,7 @@ local skill = {
}, },
["pvp_effect"]={ ["pvp_effect"]={
{ {
["type"]="shield_rebound_200", ["type"]="shield_rebound_100",
["num"]=333, ["num"]=333,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
@ -6177,7 +6177,7 @@ local skill = {
}, },
["pvp_effect"]={ ["pvp_effect"]={
{ {
["type"]="shield_rebound_400", ["type"]="shield_rebound_200",
["num"]=333, ["num"]=333,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
@ -6398,7 +6398,7 @@ local skill = {
{ {
["type"]="lethargy", ["type"]="lethargy",
["num"]=0, ["num"]=0,
["ratio"]=10000, ["ratio"]=5000,
["round"]=2 ["round"]=2
} }
}, },

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

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "攻略", ["DUNGEON_WEAPON_DESC_7"] = "攻略",
["DUNGEON_WEAPON_DESC_8"] = "首领攻略", ["DUNGEON_WEAPON_DESC_8"] = "首领攻略",
["DUNGEON_WEAPON_DESC_9"] = "近期通关", ["DUNGEON_WEAPON_DESC_9"] = "近期通关",
["DUNGEON_WEAPON_DESC_10"] = "队伍等级{0}开启", ["DUNGEON_WEAPON_DESC_10"] = "玩家等级{0}开启",
["DUNGEON_WEAPON_DESC_11"] = "通关前一章开启", ["DUNGEON_WEAPON_DESC_11"] = "通关前一章开启",
["EQUIP_DESC_1"] = "武器", ["EQUIP_DESC_1"] = "武器",
["EQUIP_DESC_2"] = "防具", ["EQUIP_DESC_2"] = "防具",
@ -419,7 +419,7 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "时空裂隙基金Ⅱ", ["DUNGEON_ARMOR_FUND_2"] = "时空裂隙基金Ⅱ",
["DUNGEON_ARMOR_DESC_15"] = "请先购买本基金", ["DUNGEON_ARMOR_DESC_15"] = "请先购买本基金",
["DUNGEON_ARMOR_DESC_16"] = "超值", ["DUNGEON_ARMOR_DESC_16"] = "超值",
["MOP_UP_DESC_3"] = "足够", ["MOP_UP_DESC_3"] = "不足",
["DUNGEON_ARMOR_DESC_17"] = "本关今日剩余次数：{0}", ["DUNGEON_ARMOR_DESC_17"] = "本关今日剩余次数：{0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "4件防具 +{0}:", ["EQUIP_DESC_26"] = "4件防具 +{0}:",

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

@ -216,7 +216,7 @@ local skill_rogue = {
["desc"]="<color=#fcff28>Combo</color>:钢铁重击对流血敌人额外造成<color=#3cff28>1</color>次伤害。" ["desc"]="<color=#fcff28>Combo</color>:钢铁重击对流血敌人额外造成<color=#3cff28>1</color>次伤害。"
}, },
[1400104]={ [1400104]={
["desc"]="钢铁重击附加的眩晕，回合数<color=#3cff28>+1</color>。" ["desc"]="钢铁重击有<color=#3cff28>50%</color>概率附加眩晕效果，2回合。"
}, },
[1400105]={ [1400105]={
["desc"]="钢铁重击附加的灼烧效果，伤害提升，回合数<color=#3cff28>+1</color>。" ["desc"]="钢铁重击附加的灼烧效果，伤害提升，回合数<color=#3cff28>+1</color>。"
@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="雷神之锤使用后随机增加一种技能的能量<color=#3cff28>2</color>点。" ["desc"]="雷神之锤使用后随机增加一种技能的能量<color=#3cff28>2</color>点。"
}, },
[2400203]={ [2400203]={
["desc"]="雷神之锤可随机消除<color=#3cff28>2</color>个元素。" ["desc"]="雷神之锤随机消除元素<color=#3cff28>+2</color>。"
}, },
[2400204]={ [2400204]={
["desc"]="索尔普攻时有<color=#3cff28>10%</color>概率附加<color=#3cff28>虚弱</color>效果，<color=#3cff28>1</color>回合。" ["desc"]="索尔普攻时有<color=#3cff28>10%</color>概率附加<color=#3cff28>虚弱</color>效果，<color=#3cff28>1</color>回合。"
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。" ["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
}, },
[3400204]={ [3400204]={
["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>100%</color>。" ["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>80%</color>。"
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>:梦魔普攻<color=#3cff28>昏睡</color>敌人将附加<color=#3cff28>禁锢</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="<color=#fcff28>Combo</color>:梦魔普攻<color=#3cff28>昏睡</color>敌人将附加<color=#3cff28>禁锢</color>效果，<color=#3cff28>2</color>回合。"
@ -537,7 +537,7 @@ local skill_rogue = {
["desc"]="霜冻冰晶后为团队附加冰盾效果，<color=#3cff28>2</color>回合。" ["desc"]="霜冻冰晶后为团队附加冰盾效果，<color=#3cff28>2</color>回合。"
}, },
[4300107]={ [4300107]={
["desc"]="霜冻冰晶附加的冰盾，可反伤<color=#3cff28>400%</color>。" ["desc"]="霜冻冰晶附加的冰盾，可反伤大量伤害。"
}, },
[4300200]={ [4300200]={
["desc"]="解锁腐败利刃：额外造成一次技能伤害，附加腐败效果，<color=#3cff28>1</color>回合。" ["desc"]="解锁腐败利刃：额外造成一次技能伤害，附加腐败效果，<color=#3cff28>1</color>回合。"
@ -627,7 +627,7 @@ local skill_rogue = {
["desc"]="护盾术沿＋方向可额外消除<color=#3cff28>4</color>格。" ["desc"]="护盾术沿＋方向可额外消除<color=#3cff28>4</color>格。"
}, },
[5200105]={ [5200105]={
["desc"]="护盾术附加的护盾，可反伤<color=#3cff28>200%</color>。" ["desc"]="护盾术附加的护盾，可反伤伤害。"
}, },
[5200106]={ [5200106]={
["desc"]="忍者伦攻击提升<color=#3cff28>15%</color>。" ["desc"]="忍者伦攻击提升<color=#3cff28>15%</color>。"
@ -645,7 +645,7 @@ local skill_rogue = {
["desc"]="魔法扫帚使用时本次普攻伤害提升<color=#3cff28>15%</color>。" ["desc"]="魔法扫帚使用时本次普攻伤害提升<color=#3cff28>15%</color>。"
}, },
[5300103]={ [5300103]={
["desc"]="魔法扫帚可附加昏睡效果，<color=#3cff28>2</color>回合。" ["desc"]="魔法扫帚有<color=#3cff28>50%</color>概率附加昏睡效果，<color=#3cff28>2</color>回合。"
}, },
[5300104]={ [5300104]={
["desc"]="魔法扫帚附加的中毒效果，伤害提升。" ["desc"]="魔法扫帚附加的中毒效果，伤害提升。"

14
lua/app/config/strings/de/buff.lua
View File

@ -130,6 +130,14 @@ local buff = {
[81]={ [81]={
["id"]=81, ["id"]=81,
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -166,12 +174,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

57
lua/app/config/strings/en/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="Damage Boost: Increases damage dealt by {0}.", ["desc"]="Damage Boost: Increases damage dealt by {0}.",
["tips_desc"]="Damage Boost: Increases all damage dealt.",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="Stun", ["show_name"]="Stun",
["desc"]="Stun: Unable to take any action this turn.", ["desc"]="Stun: Unable to take any action this turn.",
["tips_desc"]="Stun: Unable to take any action this turn.",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.", ["desc"]="Shield: Can take a certain amount of damage.",
["tips_desc"]="Shield: Can take a certain amount of damage.",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="Cold", ["show_name"]="Cold",
["desc"]="Cold: Normal attack -<color=#3cff28>{0}</color>.", ["desc"]="Cold: Normal attack -<color=#3cff28>{0}</color>.",
["tips_desc"]="Cold: Less normal attacks.",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="Rage", ["show_name"]="Rage",
["desc"]="Rage: Normal attack +<color=#3cff28>{0}</color>.", ["desc"]="Rage: Normal attack +<color=#3cff28>{0}</color>.",
["tips_desc"]="Rage: More normal attacks.",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="Counter Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>200%</color> of the damage back to the enemy.", ["desc"]="Counter Shield: Absorbs a certain amount of damage and reflects damage back to the enemy.",
["tips_desc"]="Counter Shield: Absorbs a certain amount of damage and reflects damage back to the enemy.",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="Burn", ["show_name"]="Burn",
["desc"]="Burn: Inflicts damage equal to <color=#3cff28>{0}</color> of the caster's attack at the end of the turn.", ["desc"]="Burn: Inflicts damage equal to <color=#3cff28>{0}</color> of the caster's attack at the end of the turn.",
["tips_desc"]="Burn: Inflicts a certain amount of damage at the end of the turn.",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="Vulnerable", ["show_name"]="Vulnerable",
["desc"]="Vulnerable: Increases all damage taken by <color=#3cff28>{0}</color>.", ["desc"]="Vulnerable: Increases all damage taken by <color=#3cff28>{0}</color>.",
["tips_desc"]="Vulnerable: Increases all damage taken.",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="Frozen", ["show_name"]="Frozen",
["desc"]="Frozen: Unable to take any action and buffs won't take effect this turn.", ["desc"]="Frozen: Unable to take any action and buffs won't take effect this turn.",
["tips_desc"]="Frozen: Unable to take any action and buffs won't take effect this turn.",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="Poisoned", ["show_name"]="Poisoned",
["desc"]="Poisoned: Inflicts damage equal to <color=#3cff28>{0}</color> of the caster's attack at the end of the turn.", ["desc"]="Poisoned: Inflicts damage equal to <color=#3cff28>{0}</color> of the caster's attack at the end of the turn.",
["tips_desc"]="Poisoned: Inflicts a certain amount of damage at the end of the turn.",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="Imprison", ["show_name"]="Imprison",
["desc"]="Imprison: Can only use normal attacks this turn.", ["desc"]="Imprison: Can only use normal attacks this turn.",
["tips_desc"]="Imprison: Can only use normal attacks this turn and skill gauge will not increase.",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="Corruption", ["show_name"]="Corruption",
["desc"]="Corruption: Reduces HP recovery effect by <color=#3cff28>{0}</color>.", ["desc"]="Corruption: Reduces HP recovery effect by <color=#3cff28>{0}</color>.",
["tips_desc"]="Corruption: HP recovery effect reduces.",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="Bleed", ["show_name"]="Bleed",
["desc"]="Bleed: Restores the attacker's HP upon hit and deals damage equal to <color=#3cff28>{0}</color> of the attacker's attack at the end of the turn.", ["desc"]="Bleed: Restores the attacker's HP upon hit and deals damage equal to <color=#3cff28>{0}</color> of the attacker's attack at the end of the turn.",
["tips_desc"]="Bleed: Restores the attacker's HP upon hit and deals damage at the end of the turn.",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="Weak", ["show_name"]="Weak",
["desc"]="Weak: Reduces damage dealt by <color=#3cff28>{0}</color>.", ["desc"]="Weak: Reduces damage dealt by <color=#3cff28>{0}</color>.",
["tips_desc"]="Weak: Reduces damage dealt.",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="Drowsy", ["show_name"]="Drowsy",
["desc"]="Drowsy: Unable to take any action this turn. Cured when hit.", ["desc"]="Drowsy: Unable to take any action this turn. Cured when hit.",
["tips_desc"]="Drowsy: Unable to take any action this turn. Cured when hit.",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="Curse", ["show_name"]="Curse",
["desc"]="Curse: Attacks will not deal damage but instead heal the opponent.", ["desc"]="Curse: Attacks will not deal damage but instead heal the opponent.",
["tips_desc"]="Curse: Attacks will not deal damage but instead heal the opponent.",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="Lock", ["show_name"]="Lock",
["desc"]="Lock: Locks a random color on the board and prevents it from being selected.", ["desc"]="Lock: Locks a random color on the board and prevents it from being selected.",
["tips_desc"]="Lock: Locks a random color on the board and prevents it from being selected.",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="Head-start", ["show_name"]="Head-start",
["desc"]="Head-start: Act first every turn.", ["desc"]="Head-start: Act first every turn.",
["tips_desc"]="Head-start: Act first every turn.",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="Undead", ["show_name"]="Undead",
["desc"]="Undead: Does not die from fatal damage.", ["desc"]="Undead: Does not die from fatal damage.",
["tips_desc"]="Undead: Does not die from fatal damage this turn.",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="Counterattack", ["show_name"]="Counterattack",
["desc"]="Counterattack: Has a <color=#3cff28>{0}</color> chance to counterattack after taking direct damage.", ["desc"]="Counterattack: Has a <color=#3cff28>{0}</color> chance to counterattack after taking direct damage.",
["tips_desc"]="Counterattack: Has a chance to counterattack when directly hit.",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="Damage Counter", ["show_name"]="Damage Counter",
["desc"]="Damage Counter: Reflects <color=#3cff28>{0}</color> of the enemy's damage.", ["desc"]="Damage Counter: Reflects <color=#3cff28>{0}</color> of the enemy's damage.",
["tips_desc"]="Damage Counter: Reflects enemy's damage.",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="Counter Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>400%</color> of the enemy's damage.", ["desc"]="Counter Shield : Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
["tips_desc"]="Counter Shield 2: Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="Frost Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.", ["desc"]="Frost Shield: Absorbs a certain amount of damage.",
["tips_desc"]="Frost Shield: Absorbs a certain amount of damage.",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="Frost Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP and reflects <color=#3cff28>400%</color> of the enemy's damage.", ["desc"]="Frost Shield 2: Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
["tips_desc"]="Frost Shield 2: Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="Psychic Shield", ["show_name"]="Psychic Shield",
["desc"]="Psychic Shield: While the shield is active, the bearer is invulnerable and takes no damage. Each hit taken consumes one stack of the shield.", ["desc"]="Psychic Shield: While the shield is active, the bearer is invulnerable and takes no damage. Each hit taken consumes one stack of the shield.",
["tips_desc"]="Psychic Shield: While the shield is active, the bearer is invulnerable and takes no damage. Each hit taken consumes one stack of the shield.",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="Frost Shield: Absorbs damage up to <color=#3cff28>{0}</color> of Max HP.", ["desc"]="Frost Shield: Absorbs a certain amount of damage.",
["tips_desc"]="Frost Shield: Absorbs a certain amount of damage.",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="Skill DMG Bonus", ["show_name"]="Skill DMG Bonus",
["desc"]="Skill DMG Bonus: Increases all skill damage", ["desc"]="Skill DMG Bonus: Increases all skill damage",
["tips_desc"]="Skill DMG Bonus: Increases all skill damage",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="Counter Shield : Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
["tips_desc"]="Counter Shield 2: Absorbs a certain amount of damage and reflects massive damage back to the enemy.",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="Counter Shield: Absorbs a certain amount of damage and reflects damage back to the enemy.",
["tips_desc"]="Counter Shield: Absorbs a certain amount of damage and reflects damage back to the enemy.",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

5
lua/app/config/strings/en/global.lua
View File

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "Guide", ["DUNGEON_WEAPON_DESC_7"] = "Guide",
["DUNGEON_WEAPON_DESC_8"] = "Boss Guide", ["DUNGEON_WEAPON_DESC_8"] = "Boss Guide",
["DUNGEON_WEAPON_DESC_9"] = "Recent Clearance", ["DUNGEON_WEAPON_DESC_9"] = "Recent Clearance",
["DUNGEON_WEAPON_DESC_10"] = "Team level required: {0}", ["DUNGEON_WEAPON_DESC_10"] = "Player level required: {0}",
["DUNGEON_WEAPON_DESC_11"] = "Unlocked after clearing the previous chapter.", ["DUNGEON_WEAPON_DESC_11"] = "Unlocked after clearing the previous chapter.",
["EQUIP_DESC_1"] = "Weapon", ["EQUIP_DESC_1"] = "Weapon",
["EQUIP_DESC_2"] = "Armor", ["EQUIP_DESC_2"] = "Armor",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "Time Rift Fund Ⅱ", ["DUNGEON_ARMOR_FUND_2"] = "Time Rift Fund Ⅱ",
["DUNGEON_ARMOR_DESC_15"] = "Please purchase the fund first", ["DUNGEON_ARMOR_DESC_15"] = "Please purchase the fund first",
["DUNGEON_ARMOR_DESC_16"] = "Super Value", ["DUNGEON_ARMOR_DESC_16"] = "Super Value",
["MOP_UP_DESC_3"] = "Enough", ["MOP_UP_DESC_3"] = "Insufficient",
["DUNGEON_ARMOR_DESC_17"] = "Stage attempts left today: {0}", ["DUNGEON_ARMOR_DESC_17"] = "Stage attempts left today: {0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "4-pc Armor +{0}:", ["EQUIP_DESC_26"] = "4-pc Armor +{0}:",
["BATTLE_DESC_14"] = "There is an unfinished battle. Do you want to continue?",
} }
return localization_global return localization_global

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

@ -6,7 +6,7 @@ local skill = {
["desc"]="Claymore Cyclone: Deal skill damage multiple times." ["desc"]="Claymore Cyclone: Deal skill damage multiple times."
}, },
[1300220]={ [1300220]={
["desc"]="Flame Punch: Clear <color=#3cff28>5</color> grids vertically and deal skill damage once, with a <color=#3cff28>50%</color> chance to inflict Burn for <color=#3cff28>2</color> turns." ["desc"]="Flame Punch: Clear <color=#3cff28>5</color> grids vertically and deal skill damage once, with a <color=#3cff28>50%</color> chance to inflict <color=#fcb501><u>Burn</u></color> for <color=#3cff28>2</color> turns."
}, },
[1400120]={ [1400120]={
["desc"]="Steel Strike: Change the color of 4 adjacent elements and deal massive skill damage multiple times." ["desc"]="Steel Strike: Change the color of 4 adjacent elements and deal massive skill damage multiple times."
@ -42,22 +42,22 @@ local skill = {
["desc"]="Moon Chaser: Increase damage and deal significantly skill damage once." ["desc"]="Moon Chaser: Increase damage and deal significantly skill damage once."
}, },
[3400220]={ [3400220]={
["desc"]="Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict <color=#3cff28>Drowsy</color> that lasts <color=#3cff28>2</color> turns." ["desc"]="Alluring Nightmare: Deal one additional hit of massive skill damage and has a 50% chance to inflict <color=#3cff28><color=#fcb501><u>Drowsy</u></color></color> that lasts <color=#3cff28>2</color> turns."
}, },
[4200120]={ [4200120]={
["desc"]="Elemental Link: Clear <color=#3cff28>3</color> random elements and deal skill damage once." ["desc"]="Elemental Link: Clear <color=#3cff28>3</color> random elements and deal skill damage once."
}, },
[4300120]={ [4300120]={
["desc"]="Frostbite Crystal: Deal one additional hit of skill damage and inflict Cold for <color=#3cff28>1</color> turn." ["desc"]="Frostbite Crystal: Deal one additional hit of skill damage and inflict <color=#fcb501><u>Cold</u></color> for <color=#3cff28>1</color> turn."
}, },
[4300220]={ [4300220]={
["desc"]="Corrupt Blade: Deal one additional hit of skill damage and inflict Corrupt for <color=#3cff28>1</color> turn." ["desc"]="Corrupt Blade: Deal one additional hit of skill damage and inflict <color=#fcb501><u>Corrupt</u></color> for <color=#3cff28>1</color> turn."
}, },
[4400120]={ [4400120]={
["desc"]="Frost Sword Dance: Clear <color=#3cff28>3</color> random elements and deal skill damage once. Inflict Cold for <color=#3cff28>1</color> turn." ["desc"]="Frost Sword Dance: Clear <color=#3cff28>3</color> random elements and deal skill damage once. Inflict <color=#fcb501><u>Cold</u></color> for <color=#3cff28>1</color> turn."
}, },
[4400220]={ [4400220]={
["desc"]="Pharaoh's Curse: Deal one additional hit of skill damage and inflict <color=#3cff28>Curse</color> that lasts <color=#3cff28>1</color> turn." ["desc"]="Pharaoh's Curse: Deal one additional hit of skill damage and inflict <color=#fcb501><u>Curse</u></color> that lasts <color=#3cff28>1</color> turn."
}, },
[5200120]={ [5200120]={
["desc"]="Shield Art: Apply a shield to the team for <color=#3cff28>1</color> turn." ["desc"]="Shield Art: Apply a shield to the team for <color=#3cff28>1</color> turn."

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

@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="When Mjolnir is used, a random skill energy increases by <color=#3cff28>2</color>." ["desc"]="When Mjolnir is used, a random skill energy increases by <color=#3cff28>2</color>."
}, },
[2400203]={ [2400203]={
["desc"]="Mjolnir can clear <color=#3cff28>2</color> random elements." ["desc"]="Mjolnir clears <color=#3cff28>2</color> more random elements."
}, },
[2400204]={ [2400204]={
["desc"]="Thor's normal attack has a <color=#3cff28>10%</color> chance of inflicting Weak for <color=#3cff28>1</color> turn." ["desc"]="Thor's normal attack has a <color=#3cff28>10%</color> chance of inflicting Weak for <color=#3cff28>1</color> turn."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Alluring Nightmare can clear additional <color=#3cff28>4</color> grids in the X direction." ["desc"]="Alluring Nightmare can clear additional <color=#3cff28>4</color> grids in the X direction."
}, },
[3400204]={ [3400204]={
["desc"]="The chance of Drowsy inflicted by Alluring Nightmare increases to <color=#3cff28>100%</color>." ["desc"]="The chance of Drowsy inflicted by Alluring Nightmare increases to <color=#3cff28>80%</color>."
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>: Nightmare's normal attack to <color=#3cff28>Drowsy</color> enemy will inflict <color=#3cff28>Imprison</color> for <color=#3cff28>2</color> turns." ["desc"]="<color=#fcff28>Combo</color>: Nightmare's normal attack to <color=#3cff28>Drowsy</color> enemy will inflict <color=#3cff28>Imprison</color> for <color=#3cff28>2</color> turns."

57
lua/app/config/strings/es/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="Aumento de daño: daño causado aumenta en {0}.", ["desc"]="Aumento de daño: daño causado aumenta en {0}.",
["tips_desc"]="Aumento de daño: aumento de todos daños causados.",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="Vértigo", ["show_name"]="Vértigo",
["desc"]="Vértigo: incapaz de actuar en esta ronda.", ["desc"]="Vértigo: incapaz de actuar en esta ronda.",
["tips_desc"]="Vértigo: incapaz de actuar en esta ronda.",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="Escudo: soporta daño de <color=#3cff28>{0}</color> del HP máximo.", ["desc"]="Escudo: puede soportar una cierta cantidad de daño.",
["tips_desc"]="Escudo: puede soportar una cierta cantidad de daño.",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="Escarcha", ["show_name"]="Escarcha",
["desc"]="Escarcha: número de ataque comunes - <color=#3cff28>{0}</color>.", ["desc"]="Escarcha: número de ataque comunes - <color=#3cff28>{0}</color>.",
["tips_desc"]="Escarcha: reduce el número de ATQ común.",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="Excitado", ["show_name"]="Excitado",
["desc"]="Excitado: número de ataques comunes + <color=#3cff28>{0}</color>.", ["desc"]="Excitado: número de ataques comunes + <color=#3cff28>{0}</color>.",
["tips_desc"]="Excitado: aumenta el número de ATQ común.",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="Escudo Reflexivo: soporta daño de <color=#3cff28>{0}</color> del HP máximo, y rebota <color=#3cff28>200%</color> del daño del rival.", ["desc"]="Escudo Reflexivo: puede soportar una cierta cantidad de daño y reflejar el daño del oponente.",
["tips_desc"]="Escudo Reflexivo: puede soportar una cierta cantidad de daño y reflejar el daño del oponente.",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="Quemadura", ["show_name"]="Quemadura",
["desc"]="Quemadura: al final de la ronda, causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador.", ["desc"]="Quemadura: al final de la ronda, causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador.",
["tips_desc"]="Quemadura: causa una cierta cantidad de daño al final de la ronda.",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="Vulnerabilidad", ["show_name"]="Vulnerabilidad",
["desc"]="Vulnerabilidad: todo el daño recibido aumenta en <color=#3cff28>{0}</color>.", ["desc"]="Vulnerabilidad: todo el daño recibido aumenta en <color=#3cff28>{0}</color>.",
["tips_desc"]="Vulnerabilidad: aumento de todos daños recibidos.",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="Congelado", ["show_name"]="Congelado",
["desc"]="Congelado: incapaz de actuar y aplicar el efecto de bonus en esta ronda.", ["desc"]="Congelado: incapaz de actuar y aplicar el efecto de bonus en esta ronda.",
["tips_desc"]="Congelado: incapaz de actuar y aplicar el efecto de bonus en esta ronda.",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="Envenenado", ["show_name"]="Envenenado",
["desc"]="Envenenado: al final de la ronda, causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador.", ["desc"]="Envenenado: al final de la ronda, causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador.",
["tips_desc"]="Envenenado: causa una cierta cantidad de daño al final de la ronda.",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="Encarcelado", ["show_name"]="Encarcelado",
["desc"]="Encarcelado: solo se usan ataques comunes en esta ronda.", ["desc"]="Encarcelado: solo se usan ataques comunes en esta ronda.",
["tips_desc"]="Encarcelado: solo se usa ATQ común en esta ronda, y el progreso de la habilidad no aumenta.",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="Corrupto", ["show_name"]="Corrupto",
["desc"]="Corrupto: efecto de recuperación de HP se reduce en <color=#3cff28>{0}</color>.", ["desc"]="Corrupto: efecto de recuperación de HP se reduce en <color=#3cff28>{0}</color>.",
["tips_desc"]="Corrupto: reduce el efecto de recuperación de HP.",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="Sangrado", ["show_name"]="Sangrado",
["desc"]="Sangrado: restaura HP del atacante cuando es golpeado e causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador al final de la ronda.", ["desc"]="Sangrado: restaura HP del atacante cuando es golpeado e causa un daño de <color=#3cff28>{0}</color> del ataque del lanzador al final de la ronda.",
["tips_desc"]="Sangrado: restaura HP del atacante cuando es golpeado, y causa daño al final de la ronda.",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="Débil", ["show_name"]="Débil",
["desc"]="Débil: daño causado se reduce en <color=#3cff28>{0}</color>.", ["desc"]="Débil: daño causado se reduce en <color=#3cff28>{0}</color>.",
["tips_desc"]="Debilidad: reduce el daño causado.",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="Dormido", ["show_name"]="Dormido",
["desc"]="Dormido: incapaz de actuar en esta ronda, y el efecto se eliminará al ser golpeado.", ["desc"]="Dormido: incapaz de actuar en esta ronda, y el efecto se eliminará al ser golpeado.",
["tips_desc"]="Dormido: incapaz de actuar en esta ronda, y el efecto se eliminará al ser golpeado.",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="Maldecido", ["show_name"]="Maldecido",
["desc"]="Maldecido: el ataque cura al rival en vez de causar daño.", ["desc"]="Maldecido: el ataque cura al rival en vez de causar daño.",
["tips_desc"]="Maldecido: el ataque cura al rival en vez de causar daño.",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="Bloqueo", ["show_name"]="Bloqueo",
["desc"]="Bloqueo: bloquea un color aleatorio en el tablero para que no pueda ser elegido.", ["desc"]="Bloqueo: bloquea un color aleatorio en el tablero para que no pueda ser elegido.",
["tips_desc"]="Bloqueo: bloquea un color aleatorio en el tablero para que no pueda ser elegido.",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="Iniciado", ["show_name"]="Iniciado",
["desc"]="Iniciado: toma la iniciativa en cada ronda.", ["desc"]="Iniciado: toma la iniciativa en cada ronda.",
["tips_desc"]="Iniciado: toma la iniciativa en cada ronda.",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="Inmortal", ["show_name"]="Inmortal",
["desc"]="Inmortal: no muere por daño letal.", ["desc"]="Inmortal: no muere por daño letal.",
["tips_desc"]="Inmortal: no muere por daño letal en esta ronda.",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="Contraataque", ["show_name"]="Contraataque",
["desc"]="Contraataque: al recibir daño directo, hay un <color=#3cff28>{0}</color> de chance de contraatacar.", ["desc"]="Contraataque: al recibir daño directo, hay un <color=#3cff28>{0}</color> de chance de contraatacar.",
["tips_desc"]="Contraataque: hay un chance de contra-atacar al recibir daño directo.",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="Daño Reflexivo", ["show_name"]="Daño Reflexivo",
["desc"]="Daño Reflexivo: rebota <color=#3cff28>{0}</color> el daño del rival.", ["desc"]="Daño Reflexivo: rebota <color=#3cff28>{0}</color> el daño del rival.",
["tips_desc"]="Daño Reflexivo: refleja el daño del oponente.",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="Escudo Reflexivo: soporta daño de <color=#3cff28>{0}</color> del HP máximo, y rebota <color=#3cff28>400%</color> del daño del rival.", ["desc"]="Escudo Reflexivo : puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
["tips_desc"]="Escudo Reflexivo 2: puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="Escudo de Escarcha: soporta daño de <color=#3cff28>{0}</color> del HP máximo.", ["desc"]="Escudo de Escarcha: puede soportar una cierta cantidad de daño.",
["tips_desc"]="Escudo de Escarcha: puede soportar una cierta cantidad de daño.",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="Escudo de Escarcha: soporta daño de <color=#3cff28>{0}</color> del HP máximo, y rebota <color=#3cff28>400%</color> del daño del rival.", ["desc"]="Escudo de Escarcha 2: puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
["tips_desc"]="Escudo de Escarcha 2: puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="Escudo Mental", ["show_name"]="Escudo Mental",
["desc"]="Escudo Mental: cuando el escudo está ativo, estarás inmune a todos los daños. Cada ataque acertado remueve 1 capa de escudo.", ["desc"]="Escudo Mental: cuando el escudo está ativo, estarás inmune a todos los daños. Cada ataque acertado remueve 1 capa de escudo.",
["tips_desc"]="Escudo Mental: cuando el escudo está ativo, estarás inmune a todos los daños. Cada ataque acertado remueve 1 capa de escudo.",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="Escudo de Escarcha: soporta daño de <color=#3cff28>{0}</color> del HP máximo.", ["desc"]="Escudo de Escarcha: puede soportar una cierta cantidad de daño.",
["tips_desc"]="Escudo de Escarcha: puede soportar una cierta cantidad de daño.",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="Bonus de daño de habilidad", ["show_name"]="Bonus de daño de habilidad",
["desc"]="Bonus de daño de habilidad: aumenta el daño de todas las habilidades", ["desc"]="Bonus de daño de habilidad: aumenta el daño de todas las habilidades",
["tips_desc"]="Bonus de daño de habilidad: aumenta el daño de todas las habilidades",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="Escudo Reflexivo : puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
["tips_desc"]="Escudo Reflexivo 2: puede soportar una cierta cantidad de daño y reflejar daño masivo del oponente.",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="Escudo Reflexivo: puede soportar una cierta cantidad de daño y reflejar el daño del oponente.",
["tips_desc"]="Escudo Reflexivo: puede soportar una cierta cantidad de daño y reflejar el daño del oponente.",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

7
lua/app/config/strings/es/global.lua
View File

@ -11,7 +11,7 @@ local localization_global =
["BTN_TEXT_CANCEL"] = "Cancelar", ["BTN_TEXT_CANCEL"] = "Cancelar",
["BTN_TEXT_OK"] = "Confirmar", ["BTN_TEXT_OK"] = "Confirmar",
["BATTLE_DESC_1"] = "Quieres salir del combate?", ["BATTLE_DESC_1"] = "Quieres salir del combate?",
["ITEM_NOT_ENOUGH"] = "Insuficiente {0} ", ["ITEM_NOT_ENOUGH"] = "Insuficiente {0}",
["START_DESC"] = "Iniciar", ["START_DESC"] = "Iniciar",
["ELEMENT_NAME_1"] = "elemento rojo", ["ELEMENT_NAME_1"] = "elemento rojo",
["ELEMENT_NAME_2"] = "elemento dorado", ["ELEMENT_NAME_2"] = "elemento dorado",
@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "Consejo", ["DUNGEON_WEAPON_DESC_7"] = "Consejo",
["DUNGEON_WEAPON_DESC_8"] = "Guía de Jefe", ["DUNGEON_WEAPON_DESC_8"] = "Guía de Jefe",
["DUNGEON_WEAPON_DESC_9"] = "Fase recién completada", ["DUNGEON_WEAPON_DESC_9"] = "Fase recién completada",
["DUNGEON_WEAPON_DESC_10"] = "Desbloqueado en Nv.{0} del equipo", ["DUNGEON_WEAPON_DESC_10"] = "Desbloqueado en Nv.{0} del jugador",
["DUNGEON_WEAPON_DESC_11"] = "Desbloqueado tras completar el capítulo anterior", ["DUNGEON_WEAPON_DESC_11"] = "Desbloqueado tras completar el capítulo anterior",
["EQUIP_DESC_1"] = "Arma", ["EQUIP_DESC_1"] = "Arma",
["EQUIP_DESC_2"] = "Armadura", ["EQUIP_DESC_2"] = "Armadura",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "Fondo de Grieta de Tiempo Ⅱ", ["DUNGEON_ARMOR_FUND_2"] = "Fondo de Grieta de Tiempo Ⅱ",
["DUNGEON_ARMOR_DESC_15"] = "Compra primero el fondo actual", ["DUNGEON_ARMOR_DESC_15"] = "Compra primero el fondo actual",
["DUNGEON_ARMOR_DESC_16"] = "De valor", ["DUNGEON_ARMOR_DESC_16"] = "De valor",
["MOP_UP_DESC_3"] = "Suficiente", ["MOP_UP_DESC_3"] = "Insuficiente",
["DUNGEON_ARMOR_DESC_17"] = "Quedan {0} chances hoy", ["DUNGEON_ARMOR_DESC_17"] = "Quedan {0} chances hoy",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "4 armaduras +{0}:", ["EQUIP_DESC_26"] = "4 armaduras +{0}:",
["BATTLE_DESC_14"] = "Existe una batalla inconclusa. ¿Quieres continuar?",
} }
return localization_global return localization_global

12
lua/app/config/strings/es/skill.lua
View File

@ -6,7 +6,7 @@ local skill = {
["desc"]="Torbellino de Espada: causa varios daños de habilidad extras." ["desc"]="Torbellino de Espada: causa varios daños de habilidad extras."
}, },
[1300220]={ [1300220]={
["desc"]="Puño Ardoroso: elimina <color=#3cff28>5</color> bloques verticalmente, y causa un daño de habilidad, con <color=#3cff28>50%</color> de chance de agregar efecto de quemadura durante <color=#3cff28>2</color> rondas." ["desc"]="Puño Ardoroso: elimina <color=#3cff28>5</color> bloques verticalmente, y causa un daño de habilidad, con <color=#3cff28>50%</color> de chance de aplicar <color=#fcb501><u>Quemadura</u></color> durante <color=#3cff28>2</color> rondas."
}, },
[1400120]={ [1400120]={
["desc"]="Golpe de Acero: cambia el color de <color=#3cff28>4</color> elementos circundantes y causa varios daños de habilidad masivo." ["desc"]="Golpe de Acero: cambia el color de <color=#3cff28>4</color> elementos circundantes y causa varios daños de habilidad masivo."
@ -42,22 +42,22 @@ local skill = {
["desc"]="Danza de Meteoro: aumenta el daño y causa un golpe adicional de enorme daño de habilidad." ["desc"]="Danza de Meteoro: aumenta el daño y causa un golpe adicional de enorme daño de habilidad."
}, },
[3400220]={ [3400220]={
["desc"]="Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un <color=#3cff28>50%</color> de chance de aplicar Dormido durante <color=#3cff28>2</color> rondas." ["desc"]="Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un 50% de chance de aplicar <color=#3cff28><color=#fcb501><u>Dormido</u></color></color> durante <color=#3cff28>2</color> rondas."
}, },
[4200120]={ [4200120]={
["desc"]="Enlace de Elementos: elimina <color=#3cff28>3</color> elementos aleatorios y causa un daño de habilidad." ["desc"]="Enlace de Elementos: elimina <color=#3cff28>3</color> elementos aleatorios y causa un daño de habilidad."
}, },
[4300120]={ [4300120]={
["desc"]="Cristal Escarchado: causa un daño de habilidad adicional con efecto de Escarcha durante <color=#3cff28>1</color> ronda." ["desc"]="Cristal Escarchado: causa un daño de habilidad adicional con efecto de <color=#fcb501><u>Escarcha</u></color> durante <color=#3cff28>1</color> ronda."
}, },
[4300220]={ [4300220]={
["desc"]="Filo Corrupto: causa un daño de habilidad adicional con efecto de Corrupto durante <color=#3cff28>1</color> ronda." ["desc"]="Filo Corrupto: causa un daño de habilidad adicional con efecto de <color=#fcb501><u>Corrupto</u></color> durante <color=#3cff28>1</color> ronda."
}, },
[4400120]={ [4400120]={
["desc"]="Espada de Escarcha: elimina <color=#3cff28>3</color> elementos aleatorios, y causa un daño de habilidad con efecto de Escarcha durante <color=#3cff28>1</color> ronda." ["desc"]="Espada de Escarcha: elimina <color=#3cff28>3</color> elementos aleatorios, y causa un daño de habilidad con efecto de <color=#fcb501><u>Escarcha</u></color> durante <color=#3cff28>1</color> ronda."
}, },
[4400220]={ [4400220]={
["desc"]="Maldición de Faraón: causa un daño de habilidad adicional, con efecto de <color=#3cff28>Maldecido</color> durante <color=#3cff28>1</color> ronda." ["desc"]="Maldición de Faraón: causa un daño de habilidad adicional, con efecto de <color=#fcb501><u>Maldecido</u></color> durante <color=#3cff28>1</color> ronda."
}, },
[5200120]={ [5200120]={
["desc"]="Hechizo Escudo: agrega un escudo al equipo durante <color=#3cff28>1</color> ronda." ["desc"]="Hechizo Escudo: agrega un escudo al equipo durante <color=#3cff28>1</color> ronda."

4
lua/app/config/strings/es/skill_rogue.lua
View File

@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="Al usar Martillo de Thor, la energía de una habilidad aleatoria aumenta en <color=#3cff28>2</color> puntos." ["desc"]="Al usar Martillo de Thor, la energía de una habilidad aleatoria aumenta en <color=#3cff28>2</color> puntos."
}, },
[2400203]={ [2400203]={
["desc"]="Martillo de Thor puede eliminar <color=#3cff28>2</color> elementos aleatorios." ["desc"]="Martillo de Thor elimina aleatoriamente <color=#3cff28>+2</color> elementos extras."
}, },
[2400204]={ [2400204]={
["desc"]="El ataque común de Sol tiene un <color=#3cff28>10%</color> de chance de aplicar Debilidad durante <color=#3cff28>1</color> ronda." ["desc"]="El ataque común de Sol tiene un <color=#3cff28>10%</color> de chance de aplicar Debilidad durante <color=#3cff28>1</color> ronda."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Pesadilla Hermosa elimina <color=#3cff28>4</color> bloques extras en direcciones de X." ["desc"]="Pesadilla Hermosa elimina <color=#3cff28>4</color> bloques extras en direcciones de X."
}, },
[3400204]={ [3400204]={
["desc"]="Aumenta el chance de <color=#3cff28>Dormido</color> aplicado por Pesadilla Hermosa a <color=#3cff28>100%</color>." ["desc"]="Aumenta el chance de <color=#3cff28>Dormido</color> aplicado por Pesadilla Hermosa a <color=#3cff28>80%</color>."
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>: el ataque común de Íncubo a enemigos <color=#3cff28>Dormidos</color> aplicará <color=#3cff28>Encarcelamiento</color> durante <color=#3cff28>2</color> rondas." ["desc"]="<color=#fcff28>Combo</color>: el ataque común de Íncubo a enemigos <color=#3cff28>Dormidos</color> aplicará <color=#3cff28>Encarcelamiento</color> durante <color=#3cff28>2</color> rondas."

14
lua/app/config/strings/fr/buff.lua
View File

@ -130,6 +130,14 @@ local buff = {
[81]={ [81]={
["id"]=81, ["id"]=81,
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -166,12 +174,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

57
lua/app/config/strings/id/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="Damage Boost: DMG yang diberikan meningkat {0}.", ["desc"]="Damage Boost: DMG yang diberikan meningkat {0}.",
["tips_desc"]="Damage Boost: Semua DMG yang diberikan meningkat.",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="Stun", ["show_name"]="Stun",
["desc"]="Stun: Tidak dapat bergerak pada giliran ini.", ["desc"]="Stun: Tidak dapat bergerak pada giliran ini.",
["tips_desc"]="Stun: Tidak dapat bergerak pada giliran ini.",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="Perisai: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum.", ["desc"]="Perisai: Bisa menahan sejumlah DMG.",
["tips_desc"]="Perisai: Bisa menahan sejumlah DMG.",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="Frost", ["show_name"]="Frost",
["desc"]="Frost: ATK Normal -<color=#3cff28>{0}</color>.", ["desc"]="Frost: ATK Normal -<color=#3cff28>{0}</color>.",
["tips_desc"]="Frost: Jumlah ATK Normal berkurang.",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="Excited", ["show_name"]="Excited",
["desc"]="Excited: ATK Normal +<color=#3cff28>{0}</color>.", ["desc"]="Excited: ATK Normal +<color=#3cff28>{0}</color>.",
["tips_desc"]="Excited: Jumlah ATK Normal bertambah.",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="Perisai Anti-DMG: Menerima <color=#3cff28>{0}</color> DMG dari HP maksimum dan memantulkan <color=#3cff28>200%</color> DMG musuh.", ["desc"]="Perisai Anti-DMG: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["tips_desc"]="Perisai Anti-DMG: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="Scorch", ["show_name"]="Scorch",
["desc"]="Scorch: Memberikan <color=#3cff28>{0}</color> DMG pada kekuatan penyerang di akhir giliran.", ["desc"]="Scorch: Memberikan <color=#3cff28>{0}</color> DMG pada kekuatan penyerang di akhir giliran.",
["tips_desc"]="Scorch: Memberikan sejumlah DMG di akhir giliran.",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="Rentan", ["show_name"]="Rentan",
["desc"]="Rentan: Semua DMG yang diterima meningkat <color=#3cff28>{0}</color>.", ["desc"]="Rentan: Semua DMG yang diterima meningkat <color=#3cff28>{0}</color>.",
["tips_desc"]="Rentan: Semua DMG yang diterima meningkat.",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="Freeze", ["show_name"]="Freeze",
["desc"]="Freeze: Tidak dapat bergerak pada giliran ini dan efek buff tidak berlaku.", ["desc"]="Freeze: Tidak dapat bergerak pada giliran ini dan efek buff tidak berlaku.",
["tips_desc"]="Freeze: Tidak dapat bertindak pada giliran ini dan efek buff tidak berlaku.",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="Keracunan", ["show_name"]="Keracunan",
["desc"]="Keracunan: Memberikan <color=#3cff28>{0}</color> DMG pada penyerang di akhir giliran.", ["desc"]="Keracunan: Memberikan <color=#3cff28>{0}</color> DMG pada penyerang di akhir giliran.",
["tips_desc"]="Keracunan: Memberikan sejumlah DMG di akhir giliran.",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="Larangan", ["show_name"]="Larangan",
["desc"]="Larangan: Hanya dapat menggunakan Normal ATK pada giliran ini.", ["desc"]="Larangan: Hanya dapat menggunakan Normal ATK pada giliran ini.",
["tips_desc"]="Larangan: Hanya bisa menggunakan ATK Normal di giliran ini, dan progres skill tidak akan meningkat.",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="Korupsi", ["show_name"]="Korupsi",
["desc"]="Korupsi: Efek pemulihan HP berkurang <color=#3cff28>{0}</color>.", ["desc"]="Korupsi: Efek pemulihan HP berkurang <color=#3cff28>{0}</color>.",
["tips_desc"]="Korosi: Efek pemulihan HP berkurang.",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="Bleed", ["show_name"]="Bleed",
["desc"]="Bleed: Memulihkan HP penyerang saat diserang dan memberikan <color=#3cff28>{0}</color> DMG pada penyerang di akhir giliran.", ["desc"]="Bleed: Memulihkan HP penyerang saat diserang dan memberikan <color=#3cff28>{0}</color> DMG pada penyerang di akhir giliran.",
["tips_desc"]="Bleed: Memulihkan HP penyerang saat diserang dan memberikan DMG di akhir giliran.",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="Lemah", ["show_name"]="Lemah",
["desc"]="Lemah: DMG yang diberikan berkurang <color=#3cff28>{0}</color>.", ["desc"]="Lemah: DMG yang diberikan berkurang <color=#3cff28>{0}</color>.",
["tips_desc"]="Lemah: Mengurangi DMG.",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="Kantuk", ["show_name"]="Kantuk",
["desc"]="Kantuk: Tidak dapat begerak pada giliran ini, memukul akan menghapus efek.", ["desc"]="Kantuk: Tidak dapat begerak pada giliran ini, memukul akan menghapus efek.",
["tips_desc"]="Kantuk: Tidak dapat beraksi pada giliran ini, dan menerima ATK akan menghilangkan efek.",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="Kutuk", ["show_name"]="Kutuk",
["desc"]="Kutuk: ATK tidak menyebabkan DMG, tetapi menyembuhkan musuh.", ["desc"]="Kutuk: ATK tidak menyebabkan DMG, tetapi menyembuhkan musuh.",
["tips_desc"]="Kutuk: ATK tidak menimbulkan DMG, tetapi menyembuhkan lawan.",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="Kunci", ["show_name"]="Kunci",
["desc"]="Kunci: Mengunci warna di papan tulis secara acak dan tidak dapat dipilih.", ["desc"]="Kunci: Mengunci warna di papan tulis secara acak dan tidak dapat dipilih.",
["tips_desc"]="Kunci: Mengunci warna di papan secara acak dam tidak dapat dipilih.",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="Strike", ["show_name"]="Strike",
["desc"]="Strike: Memimpin di setiap giliran.", ["desc"]="Strike: Memimpin di setiap giliran.",
["tips_desc"]="Strike: Memimpin di setiap giliran.",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="Imortal", ["show_name"]="Imortal",
["desc"]="Imortal: Tidak mati saat menerima DMG fatal.", ["desc"]="Imortal: Tidak mati saat menerima DMG fatal.",
["tips_desc"]="Imortal: Menerima DMG fatal pada giliran ini tidak akan membunuhmu.",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="Serangan Balik", ["show_name"]="Serangan Balik",
["desc"]="Serangan Balik: <color=#3cff28>{0}</color> peluang melakukan serangan balik saat menerima DMG langsung.", ["desc"]="Serangan Balik: <color=#3cff28>{0}</color> peluang melakukan serangan balik saat menerima DMG langsung.",
["tips_desc"]="Serangan Balik: Berpeluang melakukan serangan balik saat menerima DMG langsung.",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="DMG Balik", ["show_name"]="DMG Balik",
["desc"]="DMG Balik: Memantulkan <color=#3cff28>{0}</color> DMG musuh.", ["desc"]="DMG Balik: Memantulkan <color=#3cff28>{0}</color> DMG musuh.",
["tips_desc"]="DMG Balik: Memantulkan DMG lawan.",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="Perisai Anti-DMG: Menerima <color=#3cff28>{0}</color> DMG dari HP maksimum dan memantulkan <color=#3cff28>400%</color> DMG musuh.", ["desc"]="Perisai Anti-DMG : Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["tips_desc"]="Perisai Anti-DMG 2: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="Perisai Frost: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum.", ["desc"]="Perisai Frost: Dapat menahan sejumlah DMG.",
["tips_desc"]="Perisai Frost: Dapat menahan sejumlah DMG.",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="Perisai Frost: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum, dan memantulkan <color=#3cff28>400%</color> DMG musuh.", ["desc"]="Perisai Frost 2: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["tips_desc"]="Perisai Frost 2: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="Perisai Psikis", ["show_name"]="Perisai Psikis",
["desc"]="Perisai Psikis: Saat perisai aktif, pembawa perisai menjadi kebal dan tidak menerima DMG. Setiap ATK yang diterima menghabiskan 1 tumpukan perisai.", ["desc"]="Perisai Psikis: Saat perisai aktif, pembawa perisai menjadi kebal dan tidak menerima DMG. Setiap ATK yang diterima menghabiskan 1 tumpukan perisai.",
["tips_desc"]="Perisai Psikis: Tidak akan menerima DMG apa pun selama ada perisai, dan 1 layer perisai akan dikurangi untuk setiap ATK.",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="Perisai Frost: Menerima hingga <color=#3cff28>{0}</color> DMG HP maksimum.", ["desc"]="Perisai Frost: Dapat menahan sejumlah DMG.",
["tips_desc"]="Perisai Frost: Dapat menahan sejumlah DMG.",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="Peningkatan DMG Skill", ["show_name"]="Peningkatan DMG Skill",
["desc"]="Peningkatan DMG Skill: Semua DMG skill meningkat", ["desc"]="Peningkatan DMG Skill: Semua DMG skill meningkat",
["tips_desc"]="Peningkatan DMG Skill: Semua DMG skill meningkat",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="Perisai Anti-DMG : Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["tips_desc"]="Perisai Anti-DMG 2: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="Perisai Anti-DMG: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["tips_desc"]="Perisai Anti-DMG: Dapat menahan sejumlah DMG dan memantulkan kembali DMG lawan.",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

5
lua/app/config/strings/id/global.lua
View File

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "Panduan", ["DUNGEON_WEAPON_DESC_7"] = "Panduan",
["DUNGEON_WEAPON_DESC_8"] = "Panduan Boss", ["DUNGEON_WEAPON_DESC_8"] = "Panduan Boss",
["DUNGEON_WEAPON_DESC_9"] = "Riwayat Lolos", ["DUNGEON_WEAPON_DESC_9"] = "Riwayat Lolos",
["DUNGEON_WEAPON_DESC_10"] = "Syarat Level Tim: {0}", ["DUNGEON_WEAPON_DESC_10"] = "Dibuka saat level pemain Lv.{0}",
["DUNGEON_WEAPON_DESC_11"] = "Terbuka setelah menyelesaikan bab sebelumnya.", ["DUNGEON_WEAPON_DESC_11"] = "Terbuka setelah menyelesaikan bab sebelumnya.",
["EQUIP_DESC_1"] = "Senjata", ["EQUIP_DESC_1"] = "Senjata",
["EQUIP_DESC_2"] = "Armor", ["EQUIP_DESC_2"] = "Armor",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "Dana Celah Waktu Ⅱ", ["DUNGEON_ARMOR_FUND_2"] = "Dana Celah Waktu Ⅱ",
["DUNGEON_ARMOR_DESC_15"] = "Silakan beli Dana dahulu", ["DUNGEON_ARMOR_DESC_15"] = "Silakan beli Dana dahulu",
["DUNGEON_ARMOR_DESC_16"] = "Bernilai", ["DUNGEON_ARMOR_DESC_16"] = "Bernilai",
["MOP_UP_DESC_3"] = "Mencukupi", ["MOP_UP_DESC_3"] = "Tidak mencukupi",
["DUNGEON_ARMOR_DESC_17"] = "Sisa level hari ini: {0}", ["DUNGEON_ARMOR_DESC_17"] = "Sisa level hari ini: {0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "4 buah Armor +{0}:", ["EQUIP_DESC_26"] = "4 buah Armor +{0}:",
["BATTLE_DESC_14"] = "Ada battle yang belum selesai. Lanjutkan?",
} }
return localization_global return localization_global

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

@ -6,7 +6,7 @@ local skill = {
["desc"]="Topan Claymore: Memberikan DMG skill beberapa kali." ["desc"]="Topan Claymore: Memberikan DMG skill beberapa kali."
}, },
[1300220]={ [1300220]={
["desc"]="Pukulan Api: Menghapus <color=#3cff28>5</color> grid secara vertikal, memberikan DMG skill sekali, dan <color=#3cff28>50%</color> peluang memberikan Scorch selama <color=#3cff28>2</color> giliran." ["desc"]="Pukulan Api: Menghapus <color=#3cff28>5</color> grid secara vertikal dan memberikan DMG skill satu kali. Memiliki <color=#3cff28>50%</color> peluang memberikan efek <color=#fcb501><u>Scorch </u></color> selama <color=#3cff28>2</color> giliran."
}, },
[1400120]={ [1400120]={
["desc"]="Strike Baja: Ubah warna <color=#3cff28>4</color> elemen yang berdekatan dan berikan DMG skill yang besar beberapa kali." ["desc"]="Strike Baja: Ubah warna <color=#3cff28>4</color> elemen yang berdekatan dan berikan DMG skill yang besar beberapa kali."
@ -42,22 +42,22 @@ local skill = {
["desc"]="Pemburu Bulan: Meningkatkan DMG dan memberikan DMG skill yang besar sekali." ["desc"]="Pemburu Bulan: Meningkatkan DMG dan memberikan DMG skill yang besar sekali."
}, },
[3400220]={ [3400220]={
["desc"]="Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28>Kantuk</color> selama <color=#3cff28>2</color> giliran." ["desc"]="Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28><color=#fcb501><u>Kantuk</u></color></color> selama <color=#3cff28>2</color> giliran."
}, },
[4200120]={ [4200120]={
["desc"]="Link Elemen: Menghilangkan <color=#3cff28>3</color> elemen secara acak dan memberikan DMG skill." ["desc"]="Link Elemen: Menghilangkan <color=#3cff28>3</color> elemen secara acak dan memberikan DMG skill."
}, },
[4300120]={ [4300120]={
["desc"]="Kristal Es: Menyebabkan DMG skill tambahan dengan efek embun beku selama <color=#3cff28>1</color> giliran." ["desc"]="Kristal Es: Menyebabkan DMG skill tambahan dengan efek <color=#fcb501><u>Freeze</u></color> selama <color=#3cff28>1</color> giliran."
}, },
[4300220]={ [4300220]={
["desc"]="Tombak Tajam: Menyebabkan satu kali DMG skill tambahan dengan efek DMG selama <color=#3cff28>1</color> giliran." ["desc"]="Tombak Tajam: Menyebabkan satu kali DMG skill tambahan dengan efek <color=#fcb501><u>Korosi</u></color> selama <color=#3cff28>1</color> giliran."
}, },
[4400120]={ [4400120]={
["desc"]="Tarian Pedang Frost: Menghapus <color=#3cff28>3</color> elemen acak dan memberikan damage skill sekali. Menimbulkan Freeze selama <color=#3cff28>1</color> giliran." ["desc"]="Tarian Pedang Frost: Menghapus <color=#3cff28>3</color> elemen acak dan memberikan damage skill sekali. Menimbulkan efek <color=#fcb501><u>Freeze</u></color> selama <color=#3cff28>1</color> giliran."
}, },
[4400220]={ [4400220]={
["desc"]="Kutukan Firaun: Menyebakan satu kali DMG skill tambahan dengan efek <color=#3cff28>Kutuk</color> selama <color=#3cff28>1</color> giliran." ["desc"]="Kutukan Firaun: Menyebakan satu kali DMG skill tambahan dengan efek <color=#fcb501><u>Kutuk</u></color> selama <color=#3cff28>1</color> giliran."
}, },
[5200120]={ [5200120]={
["desc"]="Seni Perisai: Terapkan perisai ke tim untuk <color=#3cff28>1</color> giliran." ["desc"]="Seni Perisai: Terapkan perisai ke tim untuk <color=#3cff28>1</color> giliran."

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

@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="Palu Thor meningkatkan energi satu skill sebesar <color=#3cff28>2</color> poin secara acak saat digunakan." ["desc"]="Palu Thor meningkatkan energi satu skill sebesar <color=#3cff28>2</color> poin secara acak saat digunakan."
}, },
[2400203]={ [2400203]={
["desc"]="Palu Thor dapat menghilangkan <color=#3cff28>2</color> elemen secara acak." ["desc"]="Palu Thor menghapus <color=#3cff28>2</color> lebih banyak elemen acak."
}, },
[2400204]={ [2400204]={
["desc"]="Ada <color=#3cff28>10%</color> peluang menambahkan efek <color=#3cff28>Lemah</color> pada serangan Thor selama <color=#3cff28>1</color> giliran." ["desc"]="Ada <color=#3cff28>10%</color> peluang menambahkan efek <color=#3cff28>Lemah</color> pada serangan Thor selama <color=#3cff28>1</color> giliran."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Nightmare Z dapat menghapus <color=#3cff28>4</color> grid tambahan pada arah X." ["desc"]="Nightmare Z dapat menghapus <color=#3cff28>4</color> grid tambahan pada arah X."
}, },
[3400204]={ [3400204]={
["desc"]="Efek <color=#3cff28>Kantuk</color> Nightmare Z meningkatkan peluang hingga <color=#3cff28>100%</color>。" ["desc"]="Efek <color=#3cff28>Kantuk</color> Nightmare Z meningkatkan peluang hingga <color=#3cff28>80%</color>。"
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>: ATK Nightmare Z <color=#3cff28>Kantuk</color> musuh akan memiliki efek <color=#3cff28>Larangan</color> yang melekat selama <color=#3cff28>2</color> giliran." ["desc"]="<color=#fcff28>Combo</color>: ATK Nightmare Z <color=#3cff28>Kantuk</color> musuh akan memiliki efek <color=#3cff28>Larangan</color> yang melekat selama <color=#3cff28>2</color> giliran."

57
lua/app/config/strings/ja/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="ダメージ増加：敵に与えるダメージが{0}増加する。", ["desc"]="ダメージ増加：敵に与えるダメージが{0}増加する。",
["tips_desc"]="ダメージ増加：敵に与えるすべてのダメージが増加する。",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="スタン", ["show_name"]="スタン",
["desc"]="スタン：このターンは行動できない。", ["desc"]="スタン：このターンは行動できない。",
["tips_desc"]="スタン：このターンは行動できない。",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="シールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化する。", ["desc"]="シールド：一定量のダメージには耐えられる。",
["tips_desc"]="シールド：一定量のダメージには耐えられる。",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="凍傷", ["show_name"]="凍傷",
["desc"]="凍傷：通常攻撃の回数が-<color=#3cff28>{0}</color>。", ["desc"]="凍傷：通常攻撃の回数が-<color=#3cff28>{0}</color>。",
["tips_desc"]="凍傷：通常攻撃の回数が減少する。",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="興奮", ["show_name"]="興奮",
["desc"]="興奮：通常攻撃の回数が<color=#3cff28>+{0}</color>。", ["desc"]="興奮：通常攻撃の回数が<color=#3cff28>+{0}</color>。",
["tips_desc"]="興奮：通常攻撃の回数が増加する。",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="ミラーシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化し、<color=#3cff28>200%</color>のダメージを反射する。", ["desc"]="ミラーシールド：一定量のダメージには耐えられ、ダメージを敵に反射する。",
["tips_desc"]="ミラーシールド：一定量のダメージには耐えられ、ダメージを敵に反射する。",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="⽕傷", ["show_name"]="⽕傷",
["desc"]="⽕傷：ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。", ["desc"]="⽕傷：ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。",
["tips_desc"]="⽕傷：ターンが終了した時、敵に一定量のダメージを与える。",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="被ダメージアップ", ["show_name"]="被ダメージアップ",
["desc"]="被ダメージアップ：受けた全てのダメージが<color=#3cff28>{0}</color>増加する。", ["desc"]="被ダメージアップ：受けた全てのダメージが<color=#3cff28>{0}</color>増加する。",
["tips_desc"]="被ダメージアップ：敵が受けるダメージが増加する。",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="凍結", ["show_name"]="凍結",
["desc"]="凍結：このターンは行動できず、バフ効果も無効。", ["desc"]="凍結：このターンは行動できず、バフ効果も無効。",
["tips_desc"]="凍結：このターンは行動できず、バフ効果も無効。",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="中毒", ["show_name"]="中毒",
["desc"]="中毒：ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。", ["desc"]="中毒：ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。",
["tips_desc"]="中毒：ターンが終了した時、敵に一定量のダメージを与える。",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="拘束", ["show_name"]="拘束",
["desc"]="拘束：このターンでは通常攻撃しか使用できない。", ["desc"]="拘束：このターンでは通常攻撃しか使用できない。",
["tips_desc"]="拘束：このターンでは通常攻撃しか使用できず、且つスキルの進捗は増加しない。",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="腐敗", ["show_name"]="腐敗",
["desc"]="腐敗：HP回復効果は<color=#3cff28>{0}</color>減少する。", ["desc"]="腐敗：HP回復効果は<color=#3cff28>{0}</color>減少する。",
["tips_desc"]="腐敗：HP回復効果は減少する。",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="出血", ["show_name"]="出血",
["desc"]="出血：ダメージを受けた時は敵のHPが回復し、ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。", ["desc"]="出血：ダメージを受けた時は敵のHPが回復し、ターンが終了した時、発動者攻撃力<color=#3cff28>{0}</color>のダメージを受ける。",
["tips_desc"]="出血：ダメージを受けた時は敵のHPが回復し、ターンが終了した時、敵にダメージを与える。",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="弱体", ["show_name"]="弱体",
["desc"]="弱体：与えるダメージが<color=#3cff28>{0}</color>減少する。", ["desc"]="弱体：与えるダメージが<color=#3cff28>{0}</color>減少する。",
["tips_desc"]="弱体：与えるダメージが減少する。",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="昏睡", ["show_name"]="昏睡",
["desc"]="昏睡：このターンは行動できず、ダメージを受けると解除される。", ["desc"]="昏睡：このターンは行動できず、ダメージを受けると解除される。",
["tips_desc"]="昏睡：このターンは行動できず、ダメージを受けると解除される。",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="呪い", ["show_name"]="呪い",
["desc"]="呪い：攻撃はダメージを与えることなく、敵を回復する。", ["desc"]="呪い：攻撃はダメージを与えることなく、敵を回復する。",
["tips_desc"]="呪い：攻撃はダメージを与えることなく、敵を回復する。",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="ロック", ["show_name"]="ロック",
["desc"]="ロック：いずれの元素がロックされ、選択できなくなる。", ["desc"]="ロック：いずれの元素がロックされ、選択できなくなる。",
["tips_desc"]="ロック：いずれの元素がロックされ、選択できなくなる。",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="先手", ["show_name"]="先手",
["desc"]="先手：毎ターン先手を取る。", ["desc"]="先手：毎ターン先手を取る。",
["tips_desc"]="先手：毎ターン先手を取る。",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="不死", ["show_name"]="不死",
["desc"]="不死：致命ダメージを受けても死亡しない。", ["desc"]="不死：致命ダメージを受けても死亡しない。",
["tips_desc"]="不死：このターンで致命ダメージを受けても死亡しない。",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="反撃", ["show_name"]="反撃",
["desc"]="反撃：直接ダメージを受けた時、<color=#3cff28>{0}</color>の確率で反撃する。", ["desc"]="反撃：直接ダメージを受けた時、<color=#3cff28>{0}</color>の確率で反撃する。",
["tips_desc"]="反撃：直接ダメージを受けた時、一定の確率で反撃する。",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="反射", ["show_name"]="反射",
["desc"]="反射：<color=#3cff28>{0}</color>のダメージを反射する。", ["desc"]="反射：<color=#3cff28>{0}</color>のダメージを反射する。",
["tips_desc"]="反射：ダメージを反射する。",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="ミラーシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化し、<color=#3cff28>400%</color>のダメージを反射する。", ["desc"]="ミラーシールド：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
["tips_desc"]="ミラーシールド2：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="アイスシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化する。", ["desc"]="アイスシールド：一定量のダメージには耐えられる。",
["tips_desc"]="アイスシールド：一定量のダメージには耐えられる。",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="アイスシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化し、<color=#3cff28>400%</color>のダメージを反射する。", ["desc"]="アイスシールド2：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
["tips_desc"]="アイスシールド2：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="マインドシールド", ["show_name"]="マインドシールド",
["desc"]="マインドシールド：シールドがある間はダメージを受けず、攻撃が命中するごとにシールドが1つ減少する。", ["desc"]="マインドシールド：シールドがある間はダメージを受けず、攻撃が命中するごとにシールドが1つ減少する。",
["tips_desc"]="マインドシールド：シールドがある間はダメージを受けず、攻撃が命中するごとにシールドが1つ減少する。",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="アイスシールド：最大HP<color=#3cff28>{0}</color>のダメージを無効化する。", ["desc"]="アイスシールド：一定量のダメージには耐えられる。",
["tips_desc"]="アイスシールド：一定量のダメージには耐えられる。",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="スキルダメージ増加", ["show_name"]="スキルダメージ増加",
["desc"]="スキルダメージ増加：全てのスキルのダメージが増加する", ["desc"]="スキルダメージ増加：全てのスキルのダメージが増加する",
["tips_desc"]="スキルダメージ増加：全てのスキルのダメージが増加する",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="ミラーシールド：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
["tips_desc"]="ミラーシールド2：一定量のダメージには耐えられ、大量のダメージを敵に反射する。",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="ミラーシールド：一定量のダメージには耐えられ、ダメージを敵に反射する。",
["tips_desc"]="ミラーシールド：一定量のダメージには耐えられ、ダメージを敵に反射する。",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

5
lua/app/config/strings/ja/global.lua
View File

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "攻略", ["DUNGEON_WEAPON_DESC_7"] = "攻略",
["DUNGEON_WEAPON_DESC_8"] = "ボス攻略", ["DUNGEON_WEAPON_DESC_8"] = "ボス攻略",
["DUNGEON_WEAPON_DESC_9"] = "最近のクリア情報", ["DUNGEON_WEAPON_DESC_9"] = "最近のクリア情報",
["DUNGEON_WEAPON_DESC_10"] = "チームレベル{0}に達すると解放", ["DUNGEON_WEAPON_DESC_10"] = "プレイヤーレベル{0}に達すると解放",
["DUNGEON_WEAPON_DESC_11"] = "前章をグリア後に解放", ["DUNGEON_WEAPON_DESC_11"] = "前章をグリア後に解放",
["EQUIP_DESC_1"] = "武器", ["EQUIP_DESC_1"] = "武器",
["EQUIP_DESC_2"] = "防具", ["EQUIP_DESC_2"] = "防具",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "時空の裂け目ファンドⅡ", ["DUNGEON_ARMOR_FUND_2"] = "時空の裂け目ファンドⅡ",
["DUNGEON_ARMOR_DESC_15"] = "先にファンドを購入してください", ["DUNGEON_ARMOR_DESC_15"] = "先にファンドを購入してください",
["DUNGEON_ARMOR_DESC_16"] = "超お得", ["DUNGEON_ARMOR_DESC_16"] = "超お得",
["MOP_UP_DESC_3"] = "充足", ["MOP_UP_DESC_3"] = "不足",
["DUNGEON_ARMOR_DESC_17"] = "本日残り回数：{0}", ["DUNGEON_ARMOR_DESC_17"] = "本日残り回数：{0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "防具4つ+{0}:", ["EQUIP_DESC_26"] = "防具4つ+{0}:",
["BATTLE_DESC_14"] = "まだ終わっていないバトルがありますが、続行しますか？",
} }
return localization_global return localization_global

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

@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="「ソーのハンマー」はいずれの元素のエネルギーを<color=#3cff28>2</color>カウント増加する。" ["desc"]="「ソーのハンマー」はいずれの元素のエネルギーを<color=#3cff28>2</color>カウント増加する。"
}, },
[2400203]={ [2400203]={
["desc"]="「ソーのハンマー」はランダムで<color=#3cff28>2</color>つの元素を消す。" ["desc"]="「ソーのハンマー」はランダムで<color=#3cff28>+2</color>の元素を消す。"
}, },
[2400204]={ [2400204]={
["desc"]="ソーの通常攻撃は<color=#3cff28>10%</color>の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28>弱体</color>効果を付与する。" ["desc"]="ソーの通常攻撃は<color=#3cff28>10%</color>の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28>弱体</color>効果を付与する。"
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="「アリュールナイトメア」は追加でX方向<color=#3cff28>4</color>マスを消す。" ["desc"]="「アリュールナイトメア」は追加でX方向<color=#3cff28>4</color>マスを消す。"
}, },
[3400204]={ [3400204]={
["desc"]="「アリュールナイトメア」の<color=#3cff28>昏睡</color>効果の確率は<color=#3cff28>100%</color>に増加する。" ["desc"]="「アリュールナイトメア」の<color=#3cff28>昏睡</color>効果の確率は<color=#3cff28>80%</color>に増加する。"
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>ヒット</color>:夢魔の通常攻撃が<color=#3cff28>昏睡</color>状態の敵に<color=#3cff28>2</color>ターン<color=#3cff28>拘束</color>効果を付与する。" ["desc"]="<color=#fcff28>ヒット</color>:夢魔の通常攻撃が<color=#3cff28>昏睡</color>状態の敵に<color=#3cff28>2</color>ターン<color=#3cff28>拘束</color>効果を付与する。"

57
lua/app/config/strings/ko/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="대미지 상승: 가하는 대미지가 {0} 증가합니다.", ["desc"]="대미지 상승: 가하는 대미지가 {0} 증가합니다.",
["tips_desc"]="대미지 상승: 가하는 모든 대미지가 증가합니다.",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="기절", ["show_name"]="기절",
["desc"]="기절: 이번 턴에 움직일 수 없습니다.", ["desc"]="기절: 이번 턴에 움직일 수 없습니다.",
["tips_desc"]="기절: 이번 턴에 움직일 수 없습니다.",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수할 수 있습니다.", ["desc"]="보호막: 일정한 피해를 흡수할 수 있습니다.",
["tips_desc"]="보호막: 일정한 피해를 흡수할 수 있습니다.",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="서리 상태", ["show_name"]="서리 상태",
["desc"]="서리 상태: 일반 공격 횟수 -<color=#3cff28>{0}</color>", ["desc"]="서리 상태: 일반 공격 횟수 -<color=#3cff28>{0}</color>",
["tips_desc"]="서리 상태: 일반 공격의 횟수가 감소합니다.",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="과열 상태", ["show_name"]="과열 상태",
["desc"]="과열 상태: 일반 공격 횟수+<color=#3cff28>{0}</color>", ["desc"]="과열 상태: 일반 공격 횟수+<color=#3cff28>{0}</color>",
["tips_desc"]="과열 상태: 일반 공격 횟수가 증가합니다.",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="가시 돋친 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수하고 상대가 입힌 대미지의 <color=#3cff28>200%</color>를 되돌려줍니다.", ["desc"]="피해 반사 보호막: 일정한 피해를 흡수하며 상대의 대미지를 반사합니다.",
["tips_desc"]="피해 반사 보호막: 일정한 피해를 흡수하며 상대의 대미지를 반사합니다.",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="버닝 효과", ["show_name"]="버닝 효과",
["desc"]="버닝 효과: 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.", ["desc"]="버닝 효과: 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.",
["tips_desc"]="버닝 효과: 턴 종료 시 일정량의 피해를 입힙니다.",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="부상 효과", ["show_name"]="부상 효과",
["desc"]="부상 효과: 받는 모든 대미지가 <color=#3cff28>{0}</color> 상승합니다.", ["desc"]="부상 효과: 받는 모든 대미지가 <color=#3cff28>{0}</color> 상승합니다.",
["tips_desc"]="부상: 받는 모든 피해가 증가합니다.",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="동결 효과", ["show_name"]="동결 효과",
["desc"]="동결 효과: 이번 턴에 움직일 수 없으며 버프 효과가 적용되지 않습니다.", ["desc"]="동결 효과: 이번 턴에 움직일 수 없으며 버프 효과가 적용되지 않습니다.",
["tips_desc"]="동결: 이번 턴에 움직일 수 없으며 버프 효과가 적용되지 않습니다.",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="중독 효과", ["show_name"]="중독 효과",
["desc"]="중독 효과: 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.", ["desc"]="중독 효과: 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.",
["tips_desc"]="중독: 턴 종료 시 일정한 피해를 입힙니다.",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="속박 효과", ["show_name"]="속박 효과",
["desc"]="속박 효과: 이번 턴에는 일반 공격만 사용할 수 있습니다.", ["desc"]="속박 효과: 이번 턴에는 일반 공격만 사용할 수 있습니다.",
["tips_desc"]="속박: 이번 턴은 일반 공격만 할 수 있으며 스킬 진행도가 증가하지 않습니다.",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="부패 효과", ["show_name"]="부패 효과",
["desc"]="부패 효과: HP 회복 효과가 <color=#3cff28>{0}</color> 감소합니다.", ["desc"]="부패 효과: HP 회복 효과가 <color=#3cff28>{0}</color> 감소합니다.",
["tips_desc"]="부패: HP 회복 효과가 감소합니다.",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="출혈 효과", ["show_name"]="출혈 효과",
["desc"]="출혈 효과: 공격 받을 때 공격자의 HP가 회복되며 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.", ["desc"]="출혈 효과: 공격 받을 때 공격자의 HP가 회복되며 턴 종료 시 스킬 사용자 공격력의 <color=#3cff28>{0}</color>에 달하는 대미지를 입힙니다.",
["tips_desc"]="출혈: 피격 시 공격자가 HP를 회복하며 턴 종료 시 피해를 입힙니다.",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="탈진 효과", ["show_name"]="탈진 효과",
["desc"]="탈진 효과: 입히는 대미지가 <color=#3cff28>{0}</color> 감소합니다.", ["desc"]="탈진 효과: 입히는 대미지가 <color=#3cff28>{0}</color> 감소합니다.",
["tips_desc"]="탈진 효과: 입히는 대미지가 감소합니다.",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="수면 효과", ["show_name"]="수면 효과",
["desc"]="수면 효과: 이번 턴에 움직일 수 없으며 공격 받으면 수면 효과가 풀립니다.", ["desc"]="수면 효과: 이번 턴에 움직일 수 없으며 공격 받으면 수면 효과가 풀립니다.",
["tips_desc"]="수면: 이번 턴에 움직일 수 없으며 공격 받으면 수면 효과가 풀립니다.",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="저주", ["show_name"]="저주",
["desc"]="저주: 공격 시 상대에게 피해를 입히지 않고 오히려 상대를 치유합니다.", ["desc"]="저주: 공격 시 상대에게 피해를 입히지 않고 오히려 상대를 치유합니다.",
["tips_desc"]="저주: 공격 시 상대에게 피해를 입히지 않고 오히려 상대를 치유합니다.",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="잠금", ["show_name"]="잠금",
["desc"]="잠금: 보드에서 임의의 색상 한 가지를 선택할 수 없도록 잠급니다.", ["desc"]="잠금: 보드에서 임의의 색상 한 가지를 선택할 수 없도록 잠급니다.",
["tips_desc"]="잠금: 보드에서 임의의 색상 한 가지를 선택할 수 없도록 잠급니다.",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="선제공격", ["show_name"]="선제공격",
["desc"]="선제공격: 매 턴마다 먼저 공격할 수 있습니다.", ["desc"]="선제공격: 매 턴마다 먼저 공격할 수 있습니다.",
["tips_desc"]="선제공격: 매 턴마다 먼저 공격할 수 있습니다.",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="불멸", ["show_name"]="불멸",
["desc"]="불멸: 치명적인 대미지를 입어도 사망하지 않습니다.", ["desc"]="불멸: 치명적인 대미지를 입어도 사망하지 않습니다.",
["tips_desc"]="불멸: 이번 턴에 치명적인 대미지를 입어도 사망하지 않습니다.",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="반격", ["show_name"]="반격",
["desc"]="반격: 직접 피해를 입으면 <color=#3cff28>{0}</color> 확률로 반격합니다.", ["desc"]="반격: 직접 피해를 입으면 <color=#3cff28>{0}</color> 확률로 반격합니다.",
["tips_desc"]="반격: 직접 피해를 입을 때 확률적으로 반격합니다.",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="피해 반사", ["show_name"]="피해 반사",
["desc"]="피해 반사: 상대의 <color=#3cff28>{0}</color> 대미지를 반사합니다.", ["desc"]="피해 반사: 상대의 <color=#3cff28>{0}</color> 대미지를 반사합니다.",
["tips_desc"]="피해 반사: 상대의 대미지를 반사합니다.",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="피해 반사 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수하고 상대 대미지의 <color=#3cff28>400%</color>를 반사합니다.", ["desc"]="피해 반사 보호막: 일정한 대미지를 흡수하며 상대의 대미지를 대량 반사합니다.",
["tips_desc"]="피해 반사 보호막2: 일정한 대미지를 흡수하며 상대의 대미지를 대량 반사합니다.",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="서리 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수할 수 있습니다.", ["desc"]="서리 보호막: 일정한 피해를 흡수할 수 있습니다.",
["tips_desc"]="서리 보호막: 일정한 피해를 흡수할 수 있습니다.",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="서리 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수하며 상대가 준 대미지의 <color=#3cff28>400%</color>를 되돌려줍니다.", ["desc"]="서리 보호막2: 일정한 피해를 흡수하며 상대의 대미지를 대량 반사합니다.",
["tips_desc"]="서리 보호막2: 일정한 피해를 흡수하며 상대의 대미지를 대량 반사합니다.",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="염력 보호막", ["show_name"]="염력 보호막",
["desc"]="염력 보호막: 보호막이 존재하는 동안 대미지를 받지 않으며 공격받을 때마다 보호막이 한 층 벗겨집니다.", ["desc"]="염력 보호막: 보호막이 존재하는 동안 대미지를 받지 않으며 공격받을 때마다 보호막이 한 층 벗겨집니다.",
["tips_desc"]="염력 보호막: 보호막이 존재하는 동안 대미지를 받지 않으며 공격받을 때마다 보호막이 한 층 벗겨집니다.",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="서리 보호막: 최대 HP의 <color=#3cff28>{0}</color>에 달하는 대미지를 흡수할 수 있습니다.", ["desc"]="서리 보호막: 일정한 피해를 흡수할 수 있습니다.",
["tips_desc"]="서리 보호막: 일정한 피해를 흡수할 수 있습니다.",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="스킬 대미지 보너스", ["show_name"]="스킬 대미지 보너스",
["desc"]="스킬 대미지 보너스: 모든 스킬의 대미지가 증가합니다.", ["desc"]="스킬 대미지 보너스: 모든 스킬의 대미지가 증가합니다.",
["tips_desc"]="스킬 대미지 보너스: 모든 스킬 대미지가 증가합니다.",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="피해 반사 보호막: 일정한 대미지를 흡수하며 상대의 대미지를 대량 반사합니다.",
["tips_desc"]="피해 반사 보호막2: 일정한 대미지를 흡수하며 상대의 대미지를 대량 반사합니다.",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="피해 반사 보호막: 일정한 피해를 흡수하며 상대의 대미지를 반사합니다.",
["tips_desc"]="피해 반사 보호막: 일정한 피해를 흡수하며 상대의 대미지를 반사합니다.",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

5
lua/app/config/strings/ko/global.lua
View File

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "공략", ["DUNGEON_WEAPON_DESC_7"] = "공략",
["DUNGEON_WEAPON_DESC_8"] = "보스 공략", ["DUNGEON_WEAPON_DESC_8"] = "보스 공략",
["DUNGEON_WEAPON_DESC_9"] = "최근 클리어", ["DUNGEON_WEAPON_DESC_9"] = "최근 클리어",
["DUNGEON_WEAPON_DESC_10"] = "팀 레벨 {0} 달성 시 오픈", ["DUNGEON_WEAPON_DESC_10"] = "플레이어 레벨{0} 달성 시 오픈",
["DUNGEON_WEAPON_DESC_11"] = "이전 챕터 클리어 시 오픈", ["DUNGEON_WEAPON_DESC_11"] = "이전 챕터 클리어 시 오픈",
["EQUIP_DESC_1"] = "무기", ["EQUIP_DESC_1"] = "무기",
["EQUIP_DESC_2"] = "방어구", ["EQUIP_DESC_2"] = "방어구",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "시공간의 균열 펀드 Ⅱ", ["DUNGEON_ARMOR_FUND_2"] = "시공간의 균열 펀드 Ⅱ",
["DUNGEON_ARMOR_DESC_15"] = "먼저 이 펀드를 구매해 주세요", ["DUNGEON_ARMOR_DESC_15"] = "먼저 이 펀드를 구매해 주세요",
["DUNGEON_ARMOR_DESC_16"] = "최고 가성비", ["DUNGEON_ARMOR_DESC_16"] = "최고 가성비",
["MOP_UP_DESC_3"] = "충분합니다", ["MOP_UP_DESC_3"] = "부족",
["DUNGEON_ARMOR_DESC_17"] = "이번 챕터 오늘 남은 횟수: {0}", ["DUNGEON_ARMOR_DESC_17"] = "이번 챕터 오늘 남은 횟수: {0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "방어구 4개 +{0}:", ["EQUIP_DESC_26"] = "방어구 4개 +{0}:",
["BATTLE_DESC_14"] = "끝나지 않은 전투가 있습니다. 계속하시겠습니까?",
} }
return localization_global return localization_global

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

@ -6,7 +6,7 @@ local skill = {
["desc"]="대검 회오리바람: 여러 번의 스킬 피해를 추가로 입힙니다." ["desc"]="대검 회오리바람: 여러 번의 스킬 피해를 추가로 입힙니다."
}, },
[1300220]={ [1300220]={
["desc"]="불타는 펀치: 세로 방향으로 <color=#3cff28>5</color>개의 그리드를 소멸하고 스킬 피해를 한 번 입힙니다. <color=#3cff28>50%</color> 확률로 <color=#3cff28>2</color>턴 동안 버닝 효과를 부여합니다." ["desc"]="불타는 펀치: 세로 방향으로 <color=#3cff28>5</color>개의 그리드를 소멸하고 스킬 피해를 한 번 입힙니다. <color=#3cff28>50%</color> 확률로 <color=#3cff28>2</color>턴 동안 <color=#fcb501><u>버닝</u></color> 효과를 부여합니다."
}, },
[1400120]={ [1400120]={
["desc"]="강철 스트라이크: 주위<color=#3cff28>4</color>개 원소의 색상을 변경하며 대량의 스킬 피해를 여러 차례 입힙니다." ["desc"]="강철 스트라이크: 주위<color=#3cff28>4</color>개 원소의 색상을 변경하며 대량의 스킬 피해를 여러 차례 입힙니다."
@ -42,22 +42,22 @@ local skill = {
["desc"]="유성과 달의 숨바꼭질: 사용 후, 이번 공격 대미지가 상승하며 엄청난 양의 스킬 피해를 한 번 입힙니다." ["desc"]="유성과 달의 숨바꼭질: 사용 후, 이번 공격 대미지가 상승하며 엄청난 양의 스킬 피해를 한 번 입힙니다."
}, },
[3400220]={ [3400220]={
["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>2</color>턴 동안 <color=#3cff28> 수면</color> 효과를 부여합니다." ["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>2</color>턴 동안 <color=#3cff28><color=#fcb501><u> 수면</u></color></color> 효과를 부여합니다."
}, },
[4200120]={ [4200120]={
["desc"]="원소 연결: 무작위로 <color=#3cff28>3</color>개의 원소를 소멸하고 스킬 피해를 한 번 입힙니다." ["desc"]="원소 연결: 무작위로 <color=#3cff28>3</color>개의 원소를 소멸하고 스킬 피해를 한 번 입힙니다."
}, },
[4300120]={ [4300120]={
["desc"]="얼음 크리스탈: 추가로 한 번의 스킬 피해를 입히며 <color=#3cff28>1</color>턴 동안 서리 상태를 부여합니다." ["desc"]="얼음 크리스탈: 추가로 한 번의 스킬 피해를 입히며 <color=#3cff28>1</color>턴 동안 <color=#fcb501>서리</color> 효과를 부여합니다."
}, },
[4300220]={ [4300220]={
["desc"]="부패의 칼날: 추가로 한 번의 스킬 피해를 입히며 <color=#3cff28>1</color>턴 동안 부패 효과를 부여합니다." ["desc"]="부패의 칼날: 추가로 한 번의 스킬 피해를 입히며 <color=#3cff28>1</color>턴 동안 <color=#fcb501><u>부패</u></color> 효과를 부여합니다."
}, },
[4400120]={ [4400120]={
["desc"]="눈과 서리의 검무: 무작위로 <color=#3cff28>3</color>개의 원소를 소멸하고 한 번의 스킬 피해를 입히는 동시에 <color=#3cff28>1</color>턴 동안 서리 효과를 부여합니다." ["desc"]="눈과 서리의 검무: 무작위로 <color=#3cff28>3</color>개의 원소를 소멸하고 한 번의 스킬 피해를 입히는 동시에 <color=#3cff28>1</color>턴 동안 <color=#fcb501><u>서리</u></color> 효과를 부여합니다."
}, },
[4400220]={ [4400220]={
["desc"]="파라오의 저주: 추가로 한 번의 스킬 피해를 입히며 <color=#3cff28>1</color>턴 동안 <color=#3cff28>저주</color> 효과를 부여합니다." ["desc"]="파라오의 저주: 추가로 한 번의 스킬 피해를 입히며 <color=#3cff28>1</color>턴 동안 <color=#fcb501><u>저주</u></color> 효과를 부여합니다."
}, },
[5200120]={ [5200120]={
["desc"]="보호막 기술: 팀에게 <color=#3cff28>1</color>턴 동안 보호막을 부여합니다." ["desc"]="보호막 기술: 팀에게 <color=#3cff28>1</color>턴 동안 보호막을 부여합니다."

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

@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="토르의 망치를 사용하면 랜덤으로 하나의 스킬 에너지가 <color=#3cff28>2</color> 포인트 증가합니다." ["desc"]="토르의 망치를 사용하면 랜덤으로 하나의 스킬 에너지가 <color=#3cff28>2</color> 포인트 증가합니다."
}, },
[2400203]={ [2400203]={
["desc"]="토르의 망치는 랜덤으로 <color=#3cff28>2</color>개의 원소를 소멸할 수 있습니다." ["desc"]="토르의 무작위로 소멸하는 원소 <color=#3cff28>+2</color>"
}, },
[2400204]={ [2400204]={
["desc"]="토르의 일반 공격은 <color=#3cff28>10%</color> 확률로 <color=#3cff28>1</color>턴 동안 <color=#3cff28>탈진</color> 효과를 부여합니다." ["desc"]="토르의 일반 공격은 <color=#3cff28>10%</color> 확률로 <color=#3cff28>1</color>턴 동안 <color=#3cff28>탈진</color> 효과를 부여합니다."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="아름다운 악몽이 X 방향을 따라 추가로 <color=#3cff28>4</color>개의 그리드를 소멸할 수 있습니다." ["desc"]="아름다운 악몽이 X 방향을 따라 추가로 <color=#3cff28>4</color>개의 그리드를 소멸할 수 있습니다."
}, },
[3400204]={ [3400204]={
["desc"]="아름다운 악몽이 <color=#3cff28>수면</color> 효과를 부여할 확률이 <color=#3cff28>100%</color>로 증가합니다." ["desc"]="아름다운 악몽이 <color=#3cff28>수면</color> 효과를 부여할 확률이 <color=#3cff28>80%</color>로 증가합니다."
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>:인큐버스의 일반 공격이 <color=#3cff28>2</color>턴 동안 <color=#3cff28>수면</color> 상태의 적에게 <color=#3cff28>속박</color> 효과를 부여합니다." ["desc"]="<color=#fcff28>Combo</color>:인큐버스의 일반 공격이 <color=#3cff28>2</color>턴 동안 <color=#3cff28>수면</color> 상태의 적에게 <color=#3cff28>속박</color> 효과를 부여합니다."

57
lua/app/config/strings/pt/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="Aumento de dano: dano causado aumenta em {0}.", ["desc"]="Aumento de dano: dano causado aumenta em {0}.",
["tips_desc"]="Aumento de dano: aumento de todo dano causado.",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="Estonteado", ["show_name"]="Estonteado",
["desc"]="Estonteado: não consegue agir neste turno.", ["desc"]="Estonteado: não consegue agir neste turno.",
["tips_desc"]="Estonteado: não consegue agir neste turno.",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="Amparo: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima.", ["desc"]="Escudo: pode aguentar uma certa quantidade de dano.",
["tips_desc"]="Escudo: pode aguentar uma certa quantidade de dano.",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="Gélido", ["show_name"]="Gélido",
["desc"]="Gélido: número de golpes comuns - <color=#3cff28>{0}</color>.", ["desc"]="Gélido: número de golpes comuns - <color=#3cff28>{0}</color>.",
["tips_desc"]="Gelidez: redução do número de ataques básicos.",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="Excitado", ["show_name"]="Excitado",
["desc"]="Excitado: número de golpes comuns + <color=#3cff28>{0}</color>.", ["desc"]="Excitado: número de golpes comuns + <color=#3cff28>{0}</color>.",
["tips_desc"]="Excitação: aumenta o número de ataques básicos.",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="Escudo de Reflexão: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima e reflete <color=#3cff28>200%</color> do dano do oponente.", ["desc"]="Escudo de Reflexão: pode aguentar uma certa quantidade de dano e refletir o dano do oponente.",
["tips_desc"]="Escudo de Reflexão: pode aguentar uma certa quantidade de dano e refletir o dano do oponente.",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="Conflagrado", ["show_name"]="Conflagrado",
["desc"]="Conflagrado: no final do turno, sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador.", ["desc"]="Conflagrado: no final do turno, sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador.",
["tips_desc"]="Conflagração: causa uma certa quantidade de dano ao fim do turno.",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="Vulnerável", ["show_name"]="Vulnerável",
["desc"]="Vulnerável: sofre <color=#3cff28>{0}</color> a mais de todo o dano recebido.", ["desc"]="Vulnerável: sofre <color=#3cff28>{0}</color> a mais de todo o dano recebido.",
["tips_desc"]="Vulnerável: aumento de todo o dano recebido.",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="Congelado", ["show_name"]="Congelado",
["desc"]="Congelado: não consegue agir, nem se aplicam os bônus neste turno.", ["desc"]="Congelado: não consegue agir, nem se aplicam os bônus neste turno.",
["tips_desc"]="Congelado: não consegue agir, nem se aplicam os bônus neste turno.",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="Envenenado", ["show_name"]="Envenenado",
["desc"]="Envenenado: no final do turno, sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador.", ["desc"]="Envenenado: no final do turno, sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador.",
["tips_desc"]="Envenenamento: causa uma certa quantidade de dano ao fim do turno.",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="Encarcerado", ["show_name"]="Encarcerado",
["desc"]="Encarcerado: só consegue utilizar golpes comuns neste turno.", ["desc"]="Encarcerado: só consegue utilizar golpes comuns neste turno.",
["tips_desc"]="Encarcerado: só consegue utilizar golpes comuns neste turno e o progresso da habilidade não aumenta.",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="Corrupto", ["show_name"]="Corrupto",
["desc"]="Corrupto: reduz o efeito de recuperação de vida em <color=#3cff28>{0}</color>.", ["desc"]="Corrupto: reduz o efeito de recuperação de vida em <color=#3cff28>{0}</color>.",
["tips_desc"]="Corrupto: redução do efeito de recuperação de vida.",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="Sangrado", ["show_name"]="Sangrado",
["desc"]="Sangrado: recupera a vida do atacante ao ser atingido e sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador no final do turno.", ["desc"]="Sangrado: recupera a vida do atacante ao ser atingido e sofre um dano equivalente a <color=#3cff28>{0}</color> do Ataque do lançador no final do turno.",
["tips_desc"]="Sangramento: restaura a vida do atacante ao sofrer um ataque e causa dano ao fim do turno.",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="Enfraquecido", ["show_name"]="Enfraquecido",
["desc"]="Enfraquecido: reduz o dano causado em <color=#3cff28>{0}</color>.", ["desc"]="Enfraquecido: reduz o dano causado em <color=#3cff28>{0}</color>.",
["tips_desc"]="Enfraquecido: reduz o dano causado.",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="Sonolento", ["show_name"]="Sonolento",
["desc"]="Sonolento: não consegue agir neste turno. O efeito é removido ao ser atingido.", ["desc"]="Sonolento: não consegue agir neste turno. O efeito é removido ao ser atingido.",
["tips_desc"]="Sonolento: não consegue agir neste turno. O efeito é removido ao ser atingido.",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="Maldito", ["show_name"]="Maldito",
["desc"]="Maldito: em vez de causar dano, seus golpes curam o oponente.", ["desc"]="Maldito: em vez de causar dano, seus golpes curam o oponente.",
["tips_desc"]="Maldito: em vez de causar dano, seus golpes curam o oponente.",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="Bloqueio", ["show_name"]="Bloqueio",
["desc"]="Bloqueio: uma cor aleatória fica bloqueada no tabuleiro e não pode ser selecionada.", ["desc"]="Bloqueio: uma cor aleatória fica bloqueada no tabuleiro e não pode ser selecionada.",
["tips_desc"]="Bloqueio: uma cor aleatória fica bloqueada no tabuleiro e não pode ser selecionada.",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="Iniciativo", ["show_name"]="Iniciativo",
["desc"]="Iniciativo: sempre age primeiro em cada turno.", ["desc"]="Iniciativo: sempre age primeiro em cada turno.",
["tips_desc"]="Pioneiro: sempre age primeiro em cada turno.",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="Imortal", ["show_name"]="Imortal",
["desc"]="Imortal: não morre ao receber dano fatal.", ["desc"]="Imortal: não morre ao receber dano fatal.",
["tips_desc"]="Imortal: não morre ao receber dano fatal neste turno.",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="Contra-ataque", ["show_name"]="Contra-ataque",
["desc"]="Contra-ataque: há <color=#3cff28>{0}</color> de chance de contra-atacar ao receber dano direto.", ["desc"]="Contra-ataque: há <color=#3cff28>{0}</color> de chance de contra-atacar ao receber dano direto.",
["tips_desc"]="Contra-ataque: há uma chance de contra-atacar ao sofrer dano direto.",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="Reflexão", ["show_name"]="Reflexão",
["desc"]="Reflexão: reflete <color=#3cff28>{0}</color> do dano do oponente.", ["desc"]="Reflexão: reflete <color=#3cff28>{0}</color> do dano do oponente.",
["tips_desc"]="Reflexão: reflete o dano do oponente.",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="Escudo de Reflexão: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima e reflete <color=#3cff28>400%</color> do dano do oponente.", ["desc"]="Escudo de Reflexão : pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
["tips_desc"]="Escudo de Reflexão 2: pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="Escudo Gélido: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima.", ["desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano.",
["tips_desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano.",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="Escudo Gélido: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima e reflete <color=#3cff28>400%</color> do dano do oponente.", ["desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
["tips_desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="Escudo Mental", ["show_name"]="Escudo Mental",
["desc"]="Escudo Mental: quando o escudo está ativo, fica imune a todo o dano. Cada ataque atingido remove 1 vez do escudo.", ["desc"]="Escudo Mental: quando o escudo está ativo, fica imune a todo o dano. Cada ataque atingido remove 1 vez do escudo.",
["tips_desc"]="Escudo Mental: quando o escudo está ativo, fica imune a todo o dano. Cada ataque atingido remove 1 vez do escudo.",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="Escudo Gélido: aguenta dano equivalente a <color=#3cff28>{0}</color> da Vida Máxima.", ["desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano.",
["tips_desc"]="Escudo Gélido: pode aguentar uma certa quantidade de dano.",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="Dano de Habilidade Aumentado", ["show_name"]="Dano de Habilidade Aumentado",
["desc"]="Dano de Habilidade Aumentado: aumenta o dano de todas as habilidades.", ["desc"]="Dano de Habilidade Aumentado: aumenta o dano de todas as habilidades.",
["tips_desc"]="Dano de Habilidade Aumentado: aumenta o dano de todas as habilidades.",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="Escudo de Reflexão : pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
["tips_desc"]="Escudo de Reflexão 2: pode aguentar uma certa quantidade de dano e refletir um dano massivo do oponente.",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="Escudo de Reflexão: pode aguentar uma certa quantidade de dano e refletir o dano do oponente.",
["tips_desc"]="Escudo de Reflexão: pode aguentar uma certa quantidade de dano e refletir o dano do oponente.",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

5
lua/app/config/strings/pt/global.lua
View File

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "Guia", ["DUNGEON_WEAPON_DESC_7"] = "Guia",
["DUNGEON_WEAPON_DESC_8"] = "Guia do Chefão", ["DUNGEON_WEAPON_DESC_8"] = "Guia do Chefão",
["DUNGEON_WEAPON_DESC_9"] = "Conclusões recentes", ["DUNGEON_WEAPON_DESC_9"] = "Conclusões recentes",
["DUNGEON_WEAPON_DESC_10"] = "Desbloqueado quando a equipe atingir Nv.{0}", ["DUNGEON_WEAPON_DESC_10"] = "Desbloqueado quando o jogador atingir Nv.{0}",
["DUNGEON_WEAPON_DESC_11"] = "Desbloqueado após concluir o capítulo anterior", ["DUNGEON_WEAPON_DESC_11"] = "Desbloqueado após concluir o capítulo anterior",
["EQUIP_DESC_1"] = "Arma", ["EQUIP_DESC_1"] = "Arma",
["EQUIP_DESC_2"] = "Armadura", ["EQUIP_DESC_2"] = "Armadura",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "Fundo da Fenda Espaço-temporal Ⅱ", ["DUNGEON_ARMOR_FUND_2"] = "Fundo da Fenda Espaço-temporal Ⅱ",
["DUNGEON_ARMOR_DESC_15"] = "Compre o fundo primeiro.", ["DUNGEON_ARMOR_DESC_15"] = "Compre o fundo primeiro.",
["DUNGEON_ARMOR_DESC_16"] = "Oferta", ["DUNGEON_ARMOR_DESC_16"] = "Oferta",
["MOP_UP_DESC_3"] = "Suficiente", ["MOP_UP_DESC_3"] = "Insuficiente",
["DUNGEON_ARMOR_DESC_17"] = "Tentativas para essa fase por hoje: {0}", ["DUNGEON_ARMOR_DESC_17"] = "Tentativas para essa fase por hoje: {0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "4 armaduras + {0}:", ["EQUIP_DESC_26"] = "4 armaduras + {0}:",
["BATTLE_DESC_14"] = "Existem batalhas inacabadas, você quer continuá-las?",
} }
return localization_global return localization_global

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

@ -6,7 +6,7 @@ local skill = {
["desc"]="Turbilhão de Espadão: causa vários golpes adicionais de dano de habilidade." ["desc"]="Turbilhão de Espadão: causa vários golpes adicionais de dano de habilidade."
}, },
[1300220]={ [1300220]={
["desc"]="Punho Flamejante: elimina <color=#3cff28>5</color> blocos verticalmente e causa um dano de habilidade, com <color=#3cff28>50%</color> de chance de acionar Conflagração por <color=#3cff28>2</color> turnos." ["desc"]="Punho Flamejante: elimina <color=#3cff28>5</color> blocos verticalmente e causa um dano de habilidade, com <color=#3cff28>50%</color> de chance de acionar <color=#fcb501><u>Conflagração</u></color> por <color=#3cff28>2</color> turnos."
}, },
[1400120]={ [1400120]={
["desc"]="Golpe Metálico: muda a cor dos <color=#3cff28>4</color> elementos ao redor e causa vários golpes de dano de habilidade massivo." ["desc"]="Golpe Metálico: muda a cor dos <color=#3cff28>4</color> elementos ao redor e causa vários golpes de dano de habilidade massivo."
@ -42,22 +42,22 @@ local skill = {
["desc"]="Disparada do Meteoro: aumenta o dano causado no turno atual e causa um golpe de enorme dano de habilidade." ["desc"]="Disparada do Meteoro: aumenta o dano causado no turno atual e causa um golpe de enorme dano de habilidade."
}, },
[3400220]={ [3400220]={
["desc"]="Pesadelo Belo: Causa grande dano de habilidade adicional com 50% de chance de adicionar efeito de <color=#3cff28>sono</color> por <color=#3cff28>2</color> turnos." ["desc"]="Pesadelo da Beleza: causa adicionalmente um golpe de habilidade massivo com 50% de chance de acionar o efeito de <color=#3cff28><color=#fcb501><u>Sonolento</u></color></color> que dura <color=#3cff28>2</color> turnos."
}, },
[4200120]={ [4200120]={
["desc"]="Elo Elemental: elimina <color=#3cff28>3</color> elementos aleatórios e causa um golpe de dano de habilidade." ["desc"]="Elo Elemental: elimina <color=#3cff28>3</color> elementos aleatórios e causa um golpe de dano de habilidade."
}, },
[4300120]={ [4300120]={
["desc"]="Cristal Congelante: Causa dano adicional de habilidade e adiciona efeito de congelamento por <color=#3cff28>1</color> turno." ["desc"]="Cristal Congelante: causa adicionalmente um golpe de habilidade, acionando <color=#fcb501>Gelidez</u></color> por <color=#3cff28>1</color> turno."
}, },
[4300220]={ [4300220]={
["desc"]="Lâmina da Corrupção: Causa dano adicional de habilidade e adiciona efeito de corrupção por <color=#3cff28>1</color> turno." ["desc"]="Lâmina Corruptora: causa adicionalmente um golpe de habilidade, acionando <color=#fcb501><u>Corrupção</u></color> por <color=#3cff28>1</color> turno."
}, },
[4400120]={ [4400120]={
["desc"]="Esgrima Enregelante: elimina <color=#3cff28>3</color> elementos aleatórios e causa um golpe de dano de habilidade, acionando Gelidez por <color=#3cff28>1</color> turno." ["desc"]="Esgrima Enregelante: elimina <color=#3cff28>3</color> elementos aleatórios e causa um golpe de dano de habilidade, acionando <color=#fcb501>Gelidez</u></color> por <color=#3cff28>1</color> turno."
}, },
[4400220]={ [4400220]={
["desc"]="Maldição do Faraó: Causa dano adicional de habilidade e adiciona efeito de <color=#3cff28>maldição</color> por <color=#3cff28>1</color> turno." ["desc"]="Maldição do Faraó: causa adicionalmente um golpe de habilidade, acionando <color=#fcb501>Maldição</u></color> por <color=#3cff28>1</color> turno."
}, },
[5200120]={ [5200120]={
["desc"]="Feitiço de Amparo: adiciona um escudo à equipe por <color=#3cff28>1</color> turno." ["desc"]="Feitiço de Amparo: adiciona um escudo à equipe por <color=#3cff28>1</color> turno."

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

@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="Após usar o Martelo de Thor, aumenta aleatoriamente a energia de uma habilidade em <color=#3cff28>2</color> pontos." ["desc"]="Após usar o Martelo de Thor, aumenta aleatoriamente a energia de uma habilidade em <color=#3cff28>2</color> pontos."
}, },
[2400203]={ [2400203]={
["desc"]="O Martelo de Thor pode eliminar aleatoriamente <color=#3cff28>2</color> elementos." ["desc"]="Elementos eliminados aleatoriamente pelo Martelo de Thor <color=#3cff28>+2</color>."
}, },
[2400204]={ [2400204]={
["desc"]="Durante o ataque de Solpu, há uma probabilidade de <color=#3cff28>10%</color> de adicionar o efeito <color=#3cff28>fraqueza</color> por <color=#3cff28>1</color> turno." ["desc"]="Durante o ataque de Solpu, há uma probabilidade de <color=#3cff28>10%</color> de adicionar o efeito <color=#3cff28>fraqueza</color> por <color=#3cff28>1</color> turno."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Belo Pesadelo pode eliminar <color=#3cff28>4</color> quadrados adicionais na direção X." ["desc"]="Belo Pesadelo pode eliminar <color=#3cff28>4</color> quadrados adicionais na direção X."
}, },
[3400204]={ [3400204]={
["desc"]="A probabilidade do efeito <color=#3cff28>sono</color> adicionado por Belo Pesadelo aumenta para <color=#3cff28>100%</color>." ["desc"]="A probabilidade do efeito <color=#3cff28>sono</color> adicionado por Belo Pesadelo aumenta para <color=#3cff28>80%</color>."
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>: Ataque normal de Succubus a inimigos <color=#3cff28>adormecidos</color> adiciona o efeito <color=#3cff28>aprisionamento</color> por <color=#3cff28>2</color> turnos." ["desc"]="<color=#fcff28>Combo</color>: Ataque normal de Succubus a inimigos <color=#3cff28>adormecidos</color> adiciona o efeito <color=#3cff28>aprisionamento</color> por <color=#3cff28>2</color> turnos."

14
lua/app/config/strings/ru/buff.lua
View File

@ -130,6 +130,14 @@ local buff = {
[81]={ [81]={
["id"]=81, ["id"]=81,
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -166,12 +174,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

57
lua/app/config/strings/th/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="ดาเมจเพิ่มขึ้น: ดาเมจที่สร้างเพิ่มขึ้น{0}", ["desc"]="ดาเมจเพิ่มขึ้น: ดาเมจที่สร้างเพิ่มขึ้น{0}",
["tips_desc"]="ดาเมจเพิ่มขึ้น: ดาเมจที่สร้างทั้งหมดจะเพิ่มขึ้น",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="มึงงง", ["show_name"]="มึงงง",
["desc"]="มึงงง: รอบนี้ไม่สามารถลงมือได้", ["desc"]="มึงงง: รอบนี้ไม่สามารถลงมือได้",
["tips_desc"]="มึงงง: รอบนี้ไม่สามารถลงมือได้",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="โล่: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color>", ["desc"]="โล่: สามารถรับดาเมจที่กำหนดได้",
["tips_desc"]="โล่: สามารถรับดาเมจที่กำหนดได้",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="ฟรอสต์", ["show_name"]="ฟรอสต์",
["desc"]="ฟรอสต์: จำนวนโจมตีทั่วไป-<color=#3cff28>{0}</color>", ["desc"]="ฟรอสต์: จำนวนโจมตีทั่วไป-<color=#3cff28>{0}</color>",
["tips_desc"]="ฟรอสต์: จำนวนโจมตีทั่วไปลดลง",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="ตื่นเต้น", ["show_name"]="ตื่นเต้น",
["desc"]="ตื่นเต้น:จำนวนโจมตีทั่วไป+<color=#3cff28>{0}</color>", ["desc"]="ตื่นเต้น:จำนวนโจมตีทั่วไป+<color=#3cff28>{0}</color>",
["tips_desc"]="ตื่นเต้น: จำนวนโจมตีทั่วไปเพิ่มขึ้น",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="โล่สะท้อนดาเมจ: สามารถทนทานดาเมจของ HP สูงสุด<color=#3cff28>{0}</color> และสะท้อนดาเมจของคู่ต่อสู้<color=#3cff28>200%</color>", ["desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจที่กำหนดได้ สะท้อนดาเมจของอีกฝ่าย",
["tips_desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจที่กำหนดได้ สะท้อนดาเมจของอีกฝ่าย",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="เผาไหม้", ["show_name"]="เผาไหม้",
["desc"]="เผาไหม้: เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>", ["desc"]="เผาไหม้: เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>",
["tips_desc"]="เผาไหม้: สร้างดาเมจที่กำหนดเมื่อสิ้นสุดรอบ",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="เปราะบาง", ["show_name"]="เปราะบาง",
["desc"]="เปราะบาง: ดาเมจทั้งหมดที่ได้รับเพิ่มขึ้น<color=#3cff28>{0}</color>", ["desc"]="เปราะบาง: ดาเมจทั้งหมดที่ได้รับเพิ่มขึ้น<color=#3cff28>{0}</color>",
["tips_desc"]="อ่อนแอ: ดาเมจที่ได้รับทั้งหมดเพิ่มขึ้น",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="แช่แข็ง", ["show_name"]="แช่แข็ง",
["desc"]="แช่แข็ง: ไม่สามารถลงมือในรอบนี้ได้ และเอฟเฟกต์บัฟจะไม่มีผล", ["desc"]="แช่แข็ง: ไม่สามารถลงมือในรอบนี้ได้ และเอฟเฟกต์บัฟจะไม่มีผล",
["tips_desc"]="แช่แข็ง: ไม่สามารถลงมือในรอบนี้ได้ และเอฟเฟกต์บัฟจะไม่มีผล",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="ถูกพิษ", ["show_name"]="ถูกพิษ",
["desc"]="ถูกพิษ: เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>", ["desc"]="ถูกพิษ: เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>",
["tips_desc"]="ถูกพิษ: สร้างดาเมจที่กำหนดเมื่อสิ้นสุดรอบ",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="กักขัง", ["show_name"]="กักขัง",
["desc"]="กักขัง: รอบนี้ใช้ได้เฉพาะการโจมตีทั่วไปเท่านั้น", ["desc"]="กักขัง: รอบนี้ใช้ได้เฉพาะการโจมตีทั่วไปเท่านั้น",
["tips_desc"]="กักขัง: สามารถใช้การโจมตีทั่วไปได้ในรอบนี้เท่านั้น และความคืบหน้าของสกิลจะไม่เพิ่มขึ้น",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="การทุจริต", ["show_name"]="การทุจริต",
["desc"]="การทุจริต: เอฟเฟกต์ฟื้นฟู HP ลดลง<color=#3cff28>{0}</color>", ["desc"]="การทุจริต: เอฟเฟกต์ฟื้นฟู HP ลดลง<color=#3cff28>{0}</color>",
["tips_desc"]="การทุจริต: เอฟเฟกต์ฟื้นฟู HP ลดลง",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="เลือดไหล", ["show_name"]="เลือดไหล",
["desc"]="เลือดไหล: เมื่อได้รับโจมตีจะฟื้นฟู HP ของผู้โจมตี เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>", ["desc"]="เลือดไหล: เมื่อได้รับโจมตีจะฟื้นฟู HP ของผู้โจมตี เมื่อสิ้นสุดรอบจะสร้างดาเมจของการโจมตี<color=#3cff28>{0}</color>",
["tips_desc"]="เลือดไหล: ฟื้นฟู HP ของผู้โจมตีเมื่อถูกโจมตี และสร้างดาเมจเมื่อสิ้นสุดรอบ",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="อ่อนแอ", ["show_name"]="อ่อนแอ",
["desc"]="อ่อนแอ: ดาเมจที่สร้างขึ้นจะลดลง<color=#3cff28>{0}</color>", ["desc"]="อ่อนแอ: ดาเมจที่สร้างขึ้นจะลดลง<color=#3cff28>{0}</color>",
["tips_desc"]="อ่อนแอ: ดาเมจที่สร้างนั้นลดลง",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="หลับ", ["show_name"]="หลับ",
["desc"]="หลับ: ไม่สามารถลงมือได้ในรอบนี้ เมื่อถูกโจมตีจะลบเอฟเฟกต์", ["desc"]="หลับ: ไม่สามารถลงมือได้ในรอบนี้ เมื่อถูกโจมตีจะลบเอฟเฟกต์",
["tips_desc"]="หลับ: ไม่สามารถลงมือได้ในรอบนี้ และเอฟเฟกต์จะถูกลบออกหากถูกโจมตี",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="คำสาป", ["show_name"]="คำสาป",
["desc"]="คำสาป: โจมตีจะไม่สร้างดาเมจ แต่จะรักษาฝ่ายตรงข้าม", ["desc"]="คำสาป: โจมตีจะไม่สร้างดาเมจ แต่จะรักษาฝ่ายตรงข้าม",
["tips_desc"]="คำสาป: การโจมตีไม่สร้างดาเมจ แต่จะรักษาฝ่ายตรงข้าม",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="ล็อค", ["show_name"]="ล็อค",
["desc"]="ล็อค: สุ่มล็อคสีบนกระดานหมากรุกและไม่สามารถเลือกได้", ["desc"]="ล็อค: สุ่มล็อคสีบนกระดานหมากรุกและไม่สามารถเลือกได้",
["tips_desc"]="ล็อค: สุ่มล็อคสีบนกระดาน ไม่สามารถเลือกได้",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="ลงมือก่อน", ["show_name"]="ลงมือก่อน",
["desc"]="ลงมือก่อน: ลงมือก่อนในแต่ละรอบ", ["desc"]="ลงมือก่อน: ลงมือก่อนในแต่ละรอบ",
["tips_desc"]="ผู้ลงมือก่อน: ลงมือก่อนในแต่ละรอบ",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="อมตะ", ["show_name"]="อมตะ",
["desc"]="อมตะ: เมื่อได้รับร้ายแรงจะไม่ตาย", ["desc"]="อมตะ: เมื่อได้รับร้ายแรงจะไม่ตาย",
["tips_desc"]="อมตะ: หากได้รับดาเมจร้ายแรงในรอบนี้จะไม่ตาย",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="โต้กลับ", ["show_name"]="โต้กลับ",
["desc"]="โต้กลับ: เมื่อได้รับดาเมจโดยตรงจะมีโอกาส<color=#3cff28>{0}</color>ที่จะโต้กลับ", ["desc"]="โต้กลับ: เมื่อได้รับดาเมจโดยตรงจะมีโอกาส<color=#3cff28>{0}</color>ที่จะโต้กลับ",
["tips_desc"]="โต้กลับ: มีโอกาสโต้กลับเมื่อได้รับดาเมจโดยตรง",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="สะท้อนดาเมจ", ["show_name"]="สะท้อนดาเมจ",
["desc"]="สะท้อนดาเมจ: สะท้อนดาเมจของฝ่ายตรงข้าม<color=#3cff28>{0}</color>", ["desc"]="สะท้อนดาเมจ: สะท้อนดาเมจของฝ่ายตรงข้าม<color=#3cff28>{0}</color>",
["tips_desc"]="สะท้อนดาเมจ: สะท้อนดาเมจของฝ่ายตรงข้าม",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color> และสะท้อนดาเมจของฝ่ายตรงข้าม<color=#3cff28>400%</color>", ["desc"]="โล่สะท้อนดาเมจ : สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
["tips_desc"]="โล่สะท้อนดาเมจ 2: สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color>", ["desc"]="โล่ฟรอสต์: สามารถต้านทานดาเมจที่กำหนด",
["tips_desc"]="โล่ฟรอสต์: สามารถต้านทานดาเมจที่กำหนด",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color> และสะท้อนดาเมจของฝ่ายตรงข้าม<color=#3cff28>400%</color>", ["desc"]="โล่ฟรอสต์ 2: สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
["tips_desc"]="โล่ฟรอสต์ 2: สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="โล่จิตใจ", ["show_name"]="โล่จิตใจ",
["desc"]="โล่จิตใจ: เมื่อมีโล่อยู่จะไม่ได้รับดาเมจใดๆ ทุกครั้งที่ถูกโจมตีโล่จะถูกหัก 1 ชั้น", ["desc"]="โล่จิตใจ: เมื่อมีโล่อยู่จะไม่ได้รับดาเมจใดๆ ทุกครั้งที่ถูกโจมตีโล่จะถูกหัก 1 ชั้น",
["tips_desc"]="โล่จิตใจ: เมื่อมีโล่อยู่จะไม่ได้รับดาเมจใด ๆ ทุกครั้งที่ถูกโจมตีโล่จะถูกหัก 1 ชั้น",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="โล่ฟรอสต์: สามารถรับดาเมจของ HP สูงสุด<color=#3cff28>{0}</color>", ["desc"]="โล่ฟรอสต์: สามารถต้านทานดาเมจที่กำหนด",
["tips_desc"]="โล่ฟรอสต์: สามารถต้านทานดาเมจที่กำหนด",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="สกิลเพิ่มดาเมจ", ["show_name"]="สกิลเพิ่มดาเมจ",
["desc"]="สกิลเพิ่มดาเมจ: ดาเมจของสกิลทั้งหมดเพิ่มขึ้น", ["desc"]="สกิลเพิ่มดาเมจ: ดาเมจของสกิลทั้งหมดเพิ่มขึ้น",
["tips_desc"]="เพิ่มดาเมจสกิล: ดาเมจของสกิลทั้งหมดเพิ่มขึ้น",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="โล่สะท้อนดาเมจ : สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
["tips_desc"]="โล่สะท้อนดาเมจ 2: สามารถต้านทานดาเมจที่กำหนด และสะท้อนดาเมจจำนวนมากจากฝ่ายตรงข้าม",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจที่กำหนดได้ สะท้อนดาเมจของอีกฝ่าย",
["tips_desc"]="โล่สะท้อนดาเมจ: สามารถรับดาเมจที่กำหนดได้ สะท้อนดาเมจของอีกฝ่าย",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

5
lua/app/config/strings/th/global.lua
View File

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "กลยุทธ์", ["DUNGEON_WEAPON_DESC_7"] = "กลยุทธ์",
["DUNGEON_WEAPON_DESC_8"] = "กลยุทธ์บอส", ["DUNGEON_WEAPON_DESC_8"] = "กลยุทธ์บอส",
["DUNGEON_WEAPON_DESC_9"] = "ผ่านด่านล่าสุด", ["DUNGEON_WEAPON_DESC_9"] = "ผ่านด่านล่าสุด",
["DUNGEON_WEAPON_DESC_10"] = "ทีม Lv.{0} จะเปิด", ["DUNGEON_WEAPON_DESC_10"] = "ผู้เล่น Lv.{0} จะเปิด",
["DUNGEON_WEAPON_DESC_11"] = "ผ่านด่านบทก่อนหน้าจะเปิด", ["DUNGEON_WEAPON_DESC_11"] = "ผ่านด่านบทก่อนหน้าจะเปิด",
["EQUIP_DESC_1"] = "อาวุธ", ["EQUIP_DESC_1"] = "อาวุธ",
["EQUIP_DESC_2"] = "เกราะ", ["EQUIP_DESC_2"] = "เกราะ",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "กองทุนรอยแยกกาลอวกาศⅡ", ["DUNGEON_ARMOR_FUND_2"] = "กองทุนรอยแยกกาลอวกาศⅡ",
["DUNGEON_ARMOR_DESC_15"] = "โปรดซื้อกองทุนก่อน", ["DUNGEON_ARMOR_DESC_15"] = "โปรดซื้อกองทุนก่อน",
["DUNGEON_ARMOR_DESC_16"] = "สุดคุ้ม", ["DUNGEON_ARMOR_DESC_16"] = "สุดคุ้ม",
["MOP_UP_DESC_3"] = "เพียงพอ", ["MOP_UP_DESC_3"] = "ไม่พอ",
["DUNGEON_ARMOR_DESC_17"] = "จำนวนที่เหลือของด่านนี้ในวันนี้: {0}", ["DUNGEON_ARMOR_DESC_17"] = "จำนวนที่เหลือของด่านนี้ในวันนี้: {0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "เกราะ 4 ชิ้น +{0}:", ["EQUIP_DESC_26"] = "เกราะ 4 ชิ้น +{0}:",
["BATTLE_DESC_14"] = "มีการต่อสู้ที่ยังไม่จบ ดำเนินการต่อหรือไม่?",
} }
return localization_global return localization_global

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

@ -6,7 +6,7 @@ local skill = {
["desc"]="ลมกรดดาบ: สร้างดาเมจสกิลเพิ่มเติมหลายครั้ง" ["desc"]="ลมกรดดาบ: สร้างดาเมจสกิลเพิ่มเติมหลายครั้ง"
}, },
[1300220]={ [1300220]={
["desc"]="หมัดเพลิง: กำจัด <color=#3cff28>5</color>ช่องตามแนวตั้ง และสร้างดาเมจสกิล 1 ครั้ง มีโอกาส<color=#3cff28>50%</color>เพิ่มเอฟเฟกต์การเผาไหม้ <color=#3cff28>2 </color>รอบ" ["desc"]="หมัดเพลิง: กำจัด <color=#3cff28>5</color>ช่องตามแนวตั้ง และสร้างดาเมจสกิล 1 ครั้ง มีโอกาส<color=#3cff28>50%</color>เพิ่มเอฟเฟกต์<color=#fcb501><u>เผาไหม้</u></color> <color=#3cff28>2 </color>รอบ"
}, },
[1400120]={ [1400120]={
["desc"]="เหล็กตีหนัก: เปลี่ยนสีของธาตุ<color=#3cff28>4</color>อันที่อยู่รอบ ๆ และสร้างดาเมจสกิลมหาศาลหลายครั้ง" ["desc"]="เหล็กตีหนัก: เปลี่ยนสีของธาตุ<color=#3cff28>4</color>อันที่อยู่รอบ ๆ และสร้างดาเมจสกิลมหาศาลหลายครั้ง"
@ -42,22 +42,22 @@ local skill = {
["desc"]="ดาวตกไล่ดวงจันทร์: ดาเมจครั้งนี้จะเพิ่มขึ้นหลังจากการใช้ และสร้างดาเมจสกิลมหาศาล 1 ครั้ง" ["desc"]="ดาวตกไล่ดวงจันทร์: ดาเมจครั้งนี้จะเพิ่มขึ้นหลังจากการใช้ และสร้างดาเมจสกิลมหาศาล 1 ครั้ง"
}, },
[3400220]={ [3400220]={
["desc"]="ฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์<color=#3cff28>หลับ</color> <color=#3cff28>2</color>รอบ" ["desc"]="ฝันร้ายที่สวยงาม: สร้างดาเมจสกิลมากมายเพิ่มเติม 1 ครั้ง มีโอกาส 50% เพิ่มเอฟเฟกต์<color=#3cff28><color=#fcb501><u>หลับ</u></color></color> <color=#3cff28>2</color>รอบ"
}, },
[4200120]={ [4200120]={
["desc"]="การเชื่อมโยงธาตุ: สุ่มกำจัดธาตุ<color=#3cff28>3</color>อัน และสร้างดาเมจสกิล 1 ครั้ง" ["desc"]="การเชื่อมโยงธาตุ: สุ่มกำจัดธาตุ<color=#3cff28>3</color>อัน และสร้างดาเมจสกิล 1 ครั้ง"
}, },
[4300120]={ [4300120]={
["desc"]="ผลึกฟรอสต์: สร้างดาเมจสกิลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์ฟรอสต์ <color=#3cff28>1</color>รอบ" ["desc"]="ผลึกฟรอสต์: สร้างดาเมจสกิลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์ฟรอสต์ 1 รอบ"
}, },
[4300220]={ [4300220]={
["desc"]="ดาบทุจริต: สร้างดาเมจสกิลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์ทุจริต <color=#3cff28>1</color>รอบ" ["desc"]="ดาบทุจริต: สร้างดาเมจสกิลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์<color=#fcb501><u>ทุจริต</u></color> <color=#3cff28>1</color>รอบ"
}, },
[4400120]={ [4400120]={
["desc"]="ระบำดาบฟรอสต์: สุ่มกำจัดธาตุ<color=#3cff28>3</color>อัน และสร้างดาเมจสกิล 1 ครั้ง เพิ่มเอฟเฟกต์ฟรอสต์ <color=#3cff28>1</color>รอบ" ["desc"]="ระบำดาบฟรอสต์: สุ่มกำจัดธาตุ<color=#3cff28>3</color>อัน และสร้างดาเมจสกิล 1 ครั้ง เพิ่มเอฟเฟกต์<color=#fcb501><u>ฟรอสต์</u></color> <color=#3cff28>1</color>รอบ"
}, },
[4400220]={ [4400220]={
["desc"]="คำสาปฟาโรห์: สร้างดาเมจสกิลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์<color=#3cff28>คำสาป</color> <color=#3cff28>1</color>รอบ" ["desc"]="คำสาปฟาโรห์: สร้างดาเมจสกิลเพิ่มเติม 1 ครั้ง เพิ่มเอฟเฟกต์<color=#fcb501><u>คำสาป</color> <color=#3cff28>1</color>รอบ"
}, },
[5200120]={ [5200120]={
["desc"]="มนต์โล่: เพิ่มโล่ 1 อันให้ทีม <color=#3cff28>1</color>รอบ" ["desc"]="มนต์โล่: เพิ่มโล่ 1 อันให้ทีม <color=#3cff28>1</color>รอบ"

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

@ -354,7 +354,7 @@ local skill_rogue = {
["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด <color=#3cff28>4</color> ธาตุ" ["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด <color=#3cff28>4</color> ธาตุ"
}, },
[2400202]={ [2400202]={
["desc"]="หลังจากใช้ค้อนของเทพสายฟ้าจะสุ่มเพิ่มพลังงาน<color=#3cff28>2</color>แต้มของสกิลอย่างใดอย่างหนึ่ง" ["desc"]="ค้อนของเทพสายฟ้าสะสุ่มกำจัดธาตุ<color=#3cff28>+2</color>"
}, },
[2400203]={ [2400203]={
["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด <color=#3cff28>2</color> ธาตุ" ["desc"]="ค้อนของเทพสายฟ้าสามารถสุ่มกำจัด <color=#3cff28>2</color> ธาตุ"
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="ฝันร้ายที่สวยงามสามารถกำจัดเพิ่มเติม<color=#3cff28>4</color>ช่องตามทิศทาง X" ["desc"]="ฝันร้ายที่สวยงามสามารถกำจัดเพิ่มเติม<color=#3cff28>4</color>ช่องตามทิศทาง X"
}, },
[3400204]={ [3400204]={
["desc"]="เอฟเฟกต์<color=#3cff28>หลับ</color>ที่เพิ่มโดยฝันร้ายที่สวยงามสาม โอกาสเพิ่มขึ้นถึง<color=#3cff28>100%</color>" ["desc"]="เอฟเฟกต์<color=#3cff28>หลับ</color>ที่เพิ่มโดยฝันร้ายที่สวยงามสาม โอกาสเพิ่มขึ้นถึง<color=#3cff28>80%</color>"
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>คอมโบ</color>: เมื่อฝันร้ายโจมตีทั่วไปศัตรู<color=#3cff28>หลับ</color>จะเพิ่มเอฟเฟกต์<color=#3cff28>กักขัง</color> <color=#3cff28>2</color>รอบ" ["desc"]="<color=#fcff28>คอมโบ</color>: เมื่อฝันร้ายโจมตีทั่วไปศัตรู<color=#3cff28>หลับ</color>จะเพิ่มเอฟเฟกต์<color=#3cff28>กักขัง</color> <color=#3cff28>2</color>รอบ"

57
lua/app/config/strings/vi/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="Nâng Sát Thương: Sát thương gây ra tăng {0}.", ["desc"]="Nâng Sát Thương: Sát thương gây ra tăng {0}.",
["tips_desc"]="Nâng Sát Thương: Tăng sát thương gây ra.",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="Choáng", ["show_name"]="Choáng",
["desc"]="Choáng: Hiệp này không thể hành động.", ["desc"]="Choáng: Hiệp này không thể hành động.",
["tips_desc"]="Choáng: Hiệp này không thể hành động.",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="Khiên: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa.", ["desc"]="Khiên: Chịu một lượng ST nhất định.",
["tips_desc"]="Khiên: Chịu một lượng ST nhất định.",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="Băng Sương", ["show_name"]="Băng Sương",
["desc"]="Băng Sương: Lượt đánh thường -<color=#3cff28>{0}</color>.", ["desc"]="Băng Sương: Lượt đánh thường -<color=#3cff28>{0}</color>.",
["tips_desc"]="Băng Sương: Giảm lượt đánh thường.",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="Phấn Khởi", ["show_name"]="Phấn Khởi",
["desc"]="Phấn Khởi: Lượt đánh thường +<color=#3cff28>{0}</color>.", ["desc"]="Phấn Khởi: Lượt đánh thường +<color=#3cff28>{0}</color>.",
["tips_desc"]="Phấn Khởi: Tăng lượt đánh thường.",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="Khiên Phản Sát Thương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa, phản đòn <color=#3cff28>200%</color> sát thương lên đối phương.", ["desc"]="Khiên Phản ST: Chịu một lượng ST nhất định, phản đòn lên đối phương.",
["tips_desc"]="Khiên Phản ST: Chịu một lượng ST nhất định, phản đòn lên đối phương.",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="Thiêu Đốt", ["show_name"]="Thiêu Đốt",
["desc"]="Thiêu Đốt: Khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.", ["desc"]="Thiêu Đốt: Khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.",
["tips_desc"]="Thiêu Đốt: Khi kết thúc hiệp, gây sát thương.",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="Trọng Thương", ["show_name"]="Trọng Thương",
["desc"]="Trọng Thương: Tất cả sát thương phải nhận tăng <color=#3cff28>{0}</color>.", ["desc"]="Trọng Thương: Tất cả sát thương phải nhận tăng <color=#3cff28>{0}</color>.",
["tips_desc"]="Trọng Thương: Tăng tất cả sát thương phải nhận.",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="Đóng Băng", ["show_name"]="Đóng Băng",
["desc"]="Đóng Băng: Hiệp này không thể hành động, hiệu ứng buff không có hiệu lực.", ["desc"]="Đóng Băng: Hiệp này không thể hành động, hiệu ứng buff không có hiệu lực.",
["tips_desc"]="Đóng Băng: Hiệp này không thể hành động, hiệu ứng buff vô hiệu.",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="Trúng Độc", ["show_name"]="Trúng Độc",
["desc"]="Trúng Độc: Khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.", ["desc"]="Trúng Độc: Khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.",
["tips_desc"]="Trúng Độc: Khi kết thúc hiệp, gây sát thương.",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="Giam Cầm", ["show_name"]="Giam Cầm",
["desc"]="Giam Cầm: Hiệp này chỉ được dùng đánh thường.", ["desc"]="Giam Cầm: Hiệp này chỉ được dùng đánh thường.",
["tips_desc"]="Giam Cầm: Hiệp này chỉ được dùng đánh thường, không tăng tiến độ kỹ năng.",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="Sa Đọa", ["show_name"]="Sa Đọa",
["desc"]="Sa Đọa: Hiệu quả hồi HP giảm <color=#3cff28>{0}</color>.", ["desc"]="Sa Đọa: Hiệu quả hồi HP giảm <color=#3cff28>{0}</color>.",
["tips_desc"]="Sa Đọa: Giảm hiệu quả hồi HP.",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="Mất Máu", ["show_name"]="Mất Máu",
["desc"]="Mất Máu: Khi bị tấn công hồi HP người tấn công, khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.", ["desc"]="Mất Máu: Khi bị tấn công hồi HP người tấn công, khi kết thúc hiệp, gây sát thương bằng <color=#3cff28>{0}</color> Công của người thi triển.",
["tips_desc"]="Mất Máu: Khi bị tấn công hồi HP người tấn công, khi kết thúc hiệp, gây sát thương.",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="Suy Yếu", ["show_name"]="Suy Yếu",
["desc"]="Suy Yếu: Sát thương gây ra giảm <color=#3cff28>{0}</color>.", ["desc"]="Suy Yếu: Sát thương gây ra giảm <color=#3cff28>{0}</color>.",
["tips_desc"]="Suy Yếu: Giảm sát thương gây ra.",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="Ngủ Say", ["show_name"]="Ngủ Say",
["desc"]="Ngủ Say: Hiệp này không thể hành động, bị tấn công sẽ xóa hiệu ứng.", ["desc"]="Ngủ Say: Hiệp này không thể hành động, bị tấn công sẽ xóa hiệu ứng.",
["tips_desc"]="Ngủ Say: Hiệp này không thể hành động, bị tấn công sẽ xóa hiệu ứng.",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="Lời Nguyền", ["show_name"]="Lời Nguyền",
["desc"]="Lời Nguyền: Tấn công không gây ra sát thương, mà trị liệu cho đối phương.", ["desc"]="Lời Nguyền: Tấn công không gây ra sát thương, mà trị liệu cho đối phương.",
["tips_desc"]="Lời Nguyền: Tấn công không gây ST mà trị liệu cho đối phương.",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="Khóa", ["show_name"]="Khóa",
["desc"]="Khóa: Ngẫu nhiên khóa 1 loại màu trên ván cờ, không thể chọn.", ["desc"]="Khóa: Ngẫu nhiên khóa 1 loại màu trên ván cờ, không thể chọn.",
["tips_desc"]="Khóa: Ngẫu nhiên khóa 1 loại màu trên ván cờ, không thể chọn.",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="Tiên Phong", ["show_name"]="Tiên Phong",
["desc"]="Tiên Phong: Mỗi hiệp đều ra tay trước tiên.", ["desc"]="Tiên Phong: Mỗi hiệp đều ra tay trước tiên.",
["tips_desc"]="Tiên Phong: Mỗi hiệp đều ra tay trước tiên.",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="Bất Tử", ["show_name"]="Bất Tử",
["desc"]="Bất Tử: Khi nhận sát thương chí mạng sẽ không tử vong.", ["desc"]="Bất Tử: Khi nhận sát thương chí mạng sẽ không tử vong.",
["tips_desc"]="Bất Tử: Hiệp này khi nhận ST chí mạng sẽ không tử vong.",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="Phản Đòn", ["show_name"]="Phản Đòn",
["desc"]="Phản Đòn: Khi nhận sát thương trực tiếp có <color=#3cff28>{0}</color> tỷ lệ tiến hành Phản Đòn.", ["desc"]="Phản Đòn: Khi nhận sát thương trực tiếp có <color=#3cff28>{0}</color> tỷ lệ tiến hành Phản Đòn.",
["tips_desc"]="Phản Đòn: Khi nhận ST trực tiếp có tỷ lệ phản đòn.",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="Phản Sát Thương", ["show_name"]="Phản Sát Thương",
["desc"]="Phản Sát Thương: Phản đòn <color=#3cff28>{0}</color> sát thương lên đối phương.", ["desc"]="Phản Sát Thương: Phản đòn <color=#3cff28>{0}</color> sát thương lên đối phương.",
["tips_desc"]="Phản ST: Phản đòn sát thương lên đối phương.",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="Khiên Phản Sát Thương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa, phản đòn <color=#3cff28>400%</color> sát thương lên đối phương.", ["desc"]="Khiên Phản ST : Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
["tips_desc"]="Khiên Phản ST 2: Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa.", ["desc"]="Khiên Băng Sương: Chịu một lượng ST nhất định.",
["tips_desc"]="Khiên Băng Sương: Chịu một lượng ST nhất định.",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa, phản đòn <color=#3cff28>400%</color> sát thương lên đối phương.", ["desc"]="Khiên Băng Sương 2: Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
["tips_desc"]="Khiên Băng Sương 2: Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="Khiên Ý Niệm", ["show_name"]="Khiên Ý Niệm",
["desc"]="Khiên Ý Niệm: Khi Khiên tồn tại sẽ không chịu bất kỳ sát thương nào, cứ bị đòn tấn công đánh trúng 1 lần sẽ trừ 1 tầng Khiên.", ["desc"]="Khiên Ý Niệm: Khi Khiên tồn tại sẽ không chịu bất kỳ sát thương nào, cứ bị đòn tấn công đánh trúng 1 lần sẽ trừ 1 tầng Khiên.",
["tips_desc"]="Khiên Ý Niệm: Khi khiên tồn tại sẽ không chịu bất kỳ ST nào, cứ bị đánh trúng 1 lần sẽ trừ 1 tầng Khiên.",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="Khiên Băng Sương: Có thể chịu sát thương bằng <color=#3cff28>{0}</color> HP tối đa.", ["desc"]="Khiên Băng Sương: Chịu một lượng ST nhất định.",
["tips_desc"]="Khiên Băng Sương: Chịu một lượng ST nhất định.",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="Tăng ST Kỹ Năng", ["show_name"]="Tăng ST Kỹ Năng",
["desc"]="Tăng ST Kỹ Năng: Tăng tất cả sát thương kỹ năng", ["desc"]="Tăng ST Kỹ Năng: Tăng tất cả sát thương kỹ năng",
["tips_desc"]="Tăng ST Kỹ Năng: Tăng tất cả sát thương kỹ năng",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="Khiên Phản ST : Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
["tips_desc"]="Khiên Phản ST 2: Chịu một lượng ST nhất định, phản đòn nhiều ST lên đối phương.",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="Khiên Phản ST: Chịu một lượng ST nhất định, phản đòn lên đối phương.",
["tips_desc"]="Khiên Phản ST: Chịu một lượng ST nhất định, phản đòn lên đối phương.",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

5
lua/app/config/strings/vi/global.lua
View File

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "Chiến Lược", ["DUNGEON_WEAPON_DESC_7"] = "Chiến Lược",
["DUNGEON_WEAPON_DESC_8"] = "Chiến lược Thủ Lĩnh", ["DUNGEON_WEAPON_DESC_8"] = "Chiến lược Thủ Lĩnh",
["DUNGEON_WEAPON_DESC_9"] = "Vượt ải gần đây", ["DUNGEON_WEAPON_DESC_9"] = "Vượt ải gần đây",
["DUNGEON_WEAPON_DESC_10"] = "Đội Lv{0} mở", ["DUNGEON_WEAPON_DESC_10"] = "Người chơi Lv{0} mở",
["DUNGEON_WEAPON_DESC_11"] = "Vượt ải chương trước mở", ["DUNGEON_WEAPON_DESC_11"] = "Vượt ải chương trước mở",
["EQUIP_DESC_1"] = "Vũ Khí", ["EQUIP_DESC_1"] = "Vũ Khí",
["EQUIP_DESC_2"] = "Phòng Cụ", ["EQUIP_DESC_2"] = "Phòng Cụ",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "Quỹ Khe Nứt Không Gian Ⅱ", ["DUNGEON_ARMOR_FUND_2"] = "Quỹ Khe Nứt Không Gian Ⅱ",
["DUNGEON_ARMOR_DESC_15"] = "Hãy mua quỹ trước", ["DUNGEON_ARMOR_DESC_15"] = "Hãy mua quỹ trước",
["DUNGEON_ARMOR_DESC_16"] = "Siêu hời", ["DUNGEON_ARMOR_DESC_16"] = "Siêu hời",
["MOP_UP_DESC_3"] = "Đủ", ["MOP_UP_DESC_3"] = "Không đủ",
["DUNGEON_ARMOR_DESC_17"] = "Lượt ải còn: {0}", ["DUNGEON_ARMOR_DESC_17"] = "Lượt ải còn: {0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "4 món phòng cụ +{0}:", ["EQUIP_DESC_26"] = "4 món phòng cụ +{0}:",
["BATTLE_DESC_14"] = "Có chiến đấu còn dang dở, tiếp tục chứ?",
} }
return localization_global return localization_global

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

@ -6,7 +6,7 @@ local skill = {
["desc"]="Lốc Xoáy Cự Kiếm: Gây thêm nhiều lần sát thương kỹ năng." ["desc"]="Lốc Xoáy Cự Kiếm: Gây thêm nhiều lần sát thương kỹ năng."
}, },
[1300220]={ [1300220]={
["desc"]="Viêm Quyền: Xua tan <color=#3cff28>5</color> ô theo hàng dọc, và gây 1 lần sát thương kỹ năng, có <color=#3cff28>50%</color> kèm Thiêu Đốt, <color=#3cff28>2</color> hiệp." ["desc"]="Viêm Quyền: Xua tan <color=#3cff28>5</color> ô theo hàng dọc, và gây 1 lần ST kỹ năng, có <color=#3cff28>50%</color> kèm <color=#fcb501><u>Thiêu Đốt</u></color>, <color=#3cff28>2</color> hiệp."
}, },
[1400120]={ [1400120]={
["desc"]="Trọng Kích Sắt Thép: <color=#3cff28>4</color> Nguyên Tố xung quanh đổi màu, gây nhiều lần sát thương kỹ năng." ["desc"]="Trọng Kích Sắt Thép: <color=#3cff28>4</color> Nguyên Tố xung quanh đổi màu, gây nhiều lần sát thương kỹ năng."
@ -42,22 +42,22 @@ local skill = {
["desc"]="Sao Băng Siêu Tốc: Dùng xong tăng sát thương lần này, 1 lần sát thương kỹ năng cực lớn." ["desc"]="Sao Băng Siêu Tốc: Dùng xong tăng sát thương lần này, 1 lần sát thương kỹ năng cực lớn."
}, },
[3400220]={ [3400220]={
["desc"]="Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều sát thương kỹ năng, 50% kèm hiệu quả <color=#3cff28>Ngủ Say</color>, <color=#3cff28>2</color> hiệp." ["desc"]="Ác Mộng Tươi Đẹp: Gây thêm 1 lần nhiều ST kỹ năng, cos 50% kèm <color=#3cff28><color=#fcb501><u>Ngủ Say</u></color></color>, <color=#3cff28>2</color> hiệp."
}, },
[4200120]={ [4200120]={
["desc"]="Liên Kết Nguyên Tố: Ngẫu nhiên xua tan <color=#3cff28>3</color> Nguyên Tố, gây 1 lần sát thương kỹ năng." ["desc"]="Liên Kết Nguyên Tố: Ngẫu nhiên xua tan <color=#3cff28>3</color> Nguyên Tố, gây 1 lần sát thương kỹ năng."
}, },
[4300120]={ [4300120]={
["desc"]="Sương Băng Tinh: Gây thêm 1 lần sát thương kỹ năng, kèm hiệu quả Băng Sương, <color=#3cff28>1</color> hiệp." ["desc"]="Sương Băng Tinh: Gây thêm 1 lần ST kỹ năng, kèm <color=#fcb501><u>Băng Sương</u></color>, <color=#3cff28>1</color> hiệp."
}, },
[4300220]={ [4300220]={
["desc"]="Đao Sa Đọa: Gây thêm 1 lần sát thương kỹ năng, kèm hiệu quả Sa Đọa, <color=#3cff28>1</color> hiệp." ["desc"]="Đao Sa Đọa: Gây thêm 1 lần ST kỹ năng, kèm <color=#fcb501><u>Sa Đọa</u></color>, <color=#3cff28>1</color> hiệp."
}, },
[4400120]={ [4400120]={
["desc"]="Băng Sương Kiếm Vũ: Ngẫu nhiên xua tan <color=#3cff28>3</color> Nguyên Tố, gây 1 lần sát thương kỹ năng, kèm Băng Sương, <color=#3cff28>1</color> hiệp." ["desc"]="Băng Sương Kiếm Vũ: Ngẫu nhiên xua tan <color=#3cff28>3</color> Nguyên Tố, gây 1 lần ST kỹ năng, kèm <color=#fcb501><u>Băng Sương</u></color>, <color=#3cff28>1</color> hiệp."
}, },
[4400220]={ [4400220]={
["desc"]="Lời Nguyền Pharaoh: Gây thêm 1 lần sát thương kỹ năng, kèm hiệu quả <color=#3cff28>Lời Nguyền</color>, <color=#3cff28>1</color> hiệp." ["desc"]="Lời Nguyền Pharaoh: Gây thêm 1 lần sát thương kỹ năng, kèm <color=#fcb501><u>Lời Nguyền</u></color>, <color=#3cff28>1</color> hiệp."
}, },
[5200120]={ [5200120]={
["desc"]="Thuật Khiên: Giúp đồng đội nhận 1 Khiên, <color=#3cff28>1</color> hiệp." ["desc"]="Thuật Khiên: Giúp đồng đội nhận 1 Khiên, <color=#3cff28>1</color> hiệp."

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

@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="Sau khi dùng Búa Thor tăng ngẫu nhiên 1 loại kỹ năng <color=#3cff28>2</color> Năng Lượng." ["desc"]="Sau khi dùng Búa Thor tăng ngẫu nhiên 1 loại kỹ năng <color=#3cff28>2</color> Năng Lượng."
}, },
[2400203]={ [2400203]={
["desc"]="Búa Thor có thể xua tan ngẫu nhiên <color=#3cff28>2</color> nguyên tố." ["desc"]="Búa Thor Tố ngẫu nhiên xua tan Nguyên Tố <color=#3cff28>+2</color>."
}, },
[2400204]={ [2400204]={
["desc"]="Khi Thor đánh thường có <color=#3cff28>10%</color> kèm hiệu quả<color=#3cff28>Suy Yếu</color>, <color=#3cff28>1</color> hiệp." ["desc"]="Khi Thor đánh thường có <color=#3cff28>10%</color> kèm hiệu quả<color=#3cff28>Suy Yếu</color>, <color=#3cff28>1</color> hiệp."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm <color=#3cff28>4</color> ô." ["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm <color=#3cff28>4</color> ô."
}, },
[3400204]={ [3400204]={
["desc"]="Ác Mộng Tươi Đẹp kèm hiệu quả <color=#3cff28>Ngủ Say</color>, TL tăng đến <color=#3cff28>100%</color>." ["desc"]="Ác Mộng Tươi Đẹp kèm hiệu quả <color=#3cff28>Ngủ Say</color>, TL tăng đến <color=#3cff28>80%</color>."
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>: Khi Incubus đánh thường kẻ địch <color=#3cff28>Ngủ Say</color> sẽ kèm hiệu quả <color=#3cff28>Giam Cầm</color>, <color=#3cff28>2</color> hiệp." ["desc"]="<color=#fcff28>Combo</color>: Khi Incubus đánh thường kẻ địch <color=#3cff28>Ngủ Say</color> sẽ kèm hiệu quả <color=#3cff28>Giam Cầm</color>, <color=#3cff28>2</color> hiệp."

57
lua/app/config/strings/zh/buff.lua
View File

@ -32,157 +32,196 @@ local buff = {
[24]={ [24]={
["id"]=24, ["id"]=24,
["desc"]="傷害提升：造成的傷害提高{0}。", ["desc"]="傷害提升：造成的傷害提高{0}。",
["tips_desc"]="傷害提升：造成的所有傷害提高。",
["name"]="dmg_addition_all_add" ["name"]="dmg_addition_all_add"
}, },
[33]={ [33]={
["id"]=33, ["id"]=33,
["show_name"]="暈眩", ["show_name"]="暈眩",
["desc"]="暈眩：本回合無法行動。", ["desc"]="暈眩：本回合無法行動。",
["tips_desc"]="暈眩：本回合無法行動。",
["name"]="stun" ["name"]="stun"
}, },
[34]={ [34]={
["id"]=34, ["id"]=34,
["desc"]="護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。", ["desc"]="護盾：可承受一定傷害。",
["tips_desc"]="護盾：可承受一定傷害。",
["name"]="shield" ["name"]="shield"
}, },
[36]={ [36]={
["id"]=36, ["id"]=36,
["show_name"]="冰霜", ["show_name"]="冰霜",
["desc"]="冰霜：普攻次數-<color=#3cff28>{0}</color>。", ["desc"]="冰霜：普攻次數-<color=#3cff28>{0}</color>。",
["tips_desc"]="冰霜：普攻次數減少。",
["name"]="normal_attack_dec" ["name"]="normal_attack_dec"
}, },
[37]={ [37]={
["id"]=37, ["id"]=37,
["show_name"]="亢奮", ["show_name"]="亢奮",
["desc"]="亢奮：普攻次數+<color=#3cff28>{0}</color>。", ["desc"]="亢奮：普攻次數+<color=#3cff28>{0}</color>。",
["tips_desc"]="亢奮：普攻次數增加。",
["name"]="normal_attack_add" ["name"]="normal_attack_add"
}, },
[47]={ [47]={
["id"]=47, ["id"]=47,
["desc"]="反傷護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>200%</color>敵方傷害。", ["desc"]="反傷護盾：可承受一定傷害，反彈對方傷害。",
["tips_desc"]="反傷護盾：可承受一定傷害，反彈對方傷害。",
["name"]="shield_rebound_200" ["name"]="shield_rebound_200"
}, },
[48]={ [48]={
["id"]=48, ["id"]=48,
["show_name"]="灼燒", ["show_name"]="灼燒",
["desc"]="灼燒：回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。", ["desc"]="灼燒：回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
["tips_desc"]="灼燒：回合結束時造成一定的傷害。",
["name"]="burn" ["name"]="burn"
}, },
[49]={ [49]={
["id"]=49, ["id"]=49,
["show_name"]="易傷", ["show_name"]="易傷",
["desc"]="易傷：受到所有傷害提高<color=#3cff28>{0}</color>。", ["desc"]="易傷：受到所有傷害提高<color=#3cff28>{0}</color>。",
["tips_desc"]="易傷：受到所有傷害提高。",
["name"]="vulnerable" ["name"]="vulnerable"
}, },
[50]={ [50]={
["id"]=50, ["id"]=50,
["show_name"]="凍結", ["show_name"]="凍結",
["desc"]="凍結：本回合無法行動，且增益效果無效。", ["desc"]="凍結：本回合無法行動，且增益效果無效。",
["tips_desc"]="凍結：本回合無法行動，且增益效果無效。",
["name"]="frozen" ["name"]="frozen"
}, },
[51]={ [51]={
["id"]=51, ["id"]=51,
["show_name"]="中毒", ["show_name"]="中毒",
["desc"]="中毒：回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。", ["desc"]="中毒：回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
["tips_desc"]="中毒：回合結束時造成一定傷害。",
["name"]="poison" ["name"]="poison"
}, },
[52]={ [52]={
["id"]=52, ["id"]=52,
["show_name"]="禁錮", ["show_name"]="禁錮",
["desc"]="禁錮：本回合只可使用普攻。", ["desc"]="禁錮：本回合只可使用普攻。",
["tips_desc"]="禁錮：本回合只可使用普攻，且技能進度不會增長。",
["name"]="imprison" ["name"]="imprison"
}, },
[53]={ [53]={
["id"]=53, ["id"]=53,
["show_name"]="腐敗", ["show_name"]="腐敗",
["desc"]="腐敗：生命回復效果降低<color=#3cff28>{0}</color>。", ["desc"]="腐敗：生命回復效果降低<color=#3cff28>{0}</color>。",
["tips_desc"]="腐敗：生命回復效果降低。",
["name"]="corrupt" ["name"]="corrupt"
}, },
[54]={ [54]={
["id"]=54, ["id"]=54,
["show_name"]="流血", ["show_name"]="流血",
["desc"]="流血：受擊時回復攻擊者生命，回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。", ["desc"]="流血：受擊時回復攻擊者生命，回合結束時造成釋放者攻擊力<color=#3cff28>{0}</color>的傷害。",
["tips_desc"]="流血：受擊時回復攻擊者生命，回合結束時造成傷害。",
["name"]="bleed" ["name"]="bleed"
}, },
[55]={ [55]={
["id"]=55, ["id"]=55,
["show_name"]="虛弱", ["show_name"]="虛弱",
["desc"]="虛弱：造成的傷害降低<color=#3cff28>{0}</color>。", ["desc"]="虛弱：造成的傷害降低<color=#3cff28>{0}</color>。",
["tips_desc"]="虛弱：造成的傷害降低。",
["name"]="weaken" ["name"]="weaken"
}, },
[56]={ [56]={
["id"]=56, ["id"]=56,
["show_name"]="昏睡", ["show_name"]="昏睡",
["desc"]="昏睡：本回合無法行動，受擊會移去效果。", ["desc"]="昏睡：本回合無法行動，受擊會移去效果。",
["tips_desc"]="昏睡：本回合無法行動，受擊會移去效果。",
["name"]="lethargy" ["name"]="lethargy"
}, },
[57]={ [57]={
["id"]=57, ["id"]=57,
["show_name"]="詛咒", ["show_name"]="詛咒",
["desc"]="詛咒：攻擊不會造成傷害，而會治療對方。", ["desc"]="詛咒：攻擊不會造成傷害，而會治療對方。",
["tips_desc"]="詛咒：攻擊不會造成傷害，而是治療對方。",
["name"]="curse" ["name"]="curse"
}, },
[58]={ [58]={
["id"]=58, ["id"]=58,
["show_name"]="鎖定", ["show_name"]="鎖定",
["desc"]="鎖定：隨機鎖定棋盤上的一種顏色，無法選中。", ["desc"]="鎖定：隨機鎖定棋盤上的一種顏色，無法選中。",
["tips_desc"]="鎖定：隨機鎖定棋盤上的一種顏色，無法選中。",
["name"]="lock" ["name"]="lock"
}, },
[59]={ [59]={
["id"]=59, ["id"]=59,
["show_name"]="先手", ["show_name"]="先手",
["desc"]="先手：每回合都率先出手。", ["desc"]="先手：每回合都率先出手。",
["tips_desc"]="先手：每回合都率先出手。",
["name"]="first_hand" ["name"]="first_hand"
}, },
[61]={ [61]={
["id"]=61, ["id"]=61,
["show_name"]="不死", ["show_name"]="不死",
["desc"]="不死：受到致命傷害不會死亡。", ["desc"]="不死：受到致命傷害不會死亡。",
["tips_desc"]="不死：本回合受到致命傷害不會死亡。",
["name"]="undead" ["name"]="undead"
}, },
[62]={ [62]={
["id"]=62, ["id"]=62,
["show_name"]="反擊", ["show_name"]="反擊",
["desc"]="反擊：受到直接傷害時有<color=#3cff28>{0}</color>的機率進行反擊。", ["desc"]="反擊：受到直接傷害時有<color=#3cff28>{0}</color>的機率進行反擊。",
["tips_desc"]="反擊：受到直接傷害時有機率進行反擊。",
["name"]="counterattack" ["name"]="counterattack"
}, },
[63]={ [63]={
["id"]=63, ["id"]=63,
["show_name"]="反傷", ["show_name"]="反傷",
["desc"]="反傷：反彈<color=#3cff28>{0}</color>敵方傷害。", ["desc"]="反傷：反彈<color=#3cff28>{0}</color>敵方傷害。",
["tips_desc"]="反傷：反彈對方傷害。",
["name"]="thorns" ["name"]="thorns"
}, },
[73]={ [73]={
["id"]=73, ["id"]=73,
["desc"]="反傷護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>400%</color>敵方傷害。", ["desc"]="反傷護盾：可承受一定傷害，反彈對方大量傷害。",
["tips_desc"]="反傷護盾2：可承受一定傷害，反彈對方大量傷害。",
["name"]="shield_rebound_400" ["name"]="shield_rebound_400"
}, },
[74]={ [74]={
["id"]=74, ["id"]=74,
["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。", ["desc"]="冰霜護盾：可承受一定傷害。",
["tips_desc"]="冰霜護盾：可承受一定傷害。",
["name"]="shield_ice" ["name"]="shield_ice"
}, },
[75]={ [75]={
["id"]=75, ["id"]=75,
["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害，反彈<color=#3cff28>400%</color>敵方傷害。", ["desc"]="冰霜護盾2：可承受一定傷害，反彈對方大量傷害。",
["tips_desc"]="冰霜護盾2：可承受一定傷害，反彈對方大量傷害。",
["name"]="shield_ice_rebound_400" ["name"]="shield_ice_rebound_400"
}, },
[79]={ [79]={
["id"]=79, ["id"]=79,
["show_name"]="意念護盾", ["show_name"]="意念護盾",
["desc"]="意念護盾：護盾存在時不會受到任何傷害，每被攻擊命中1次將扣除1層護盾。", ["desc"]="意念護盾：護盾存在時不會受到任何傷害，每被攻擊命中1次將扣除1層護盾。",
["tips_desc"]="意念護盾：護盾存在時不會受到任何傷害，每被攻擊命中1次將扣除1層護盾。",
["name"]="invincible_shield" ["name"]="invincible_shield"
}, },
[80]={ [80]={
["id"]=80, ["id"]=80,
["desc"]="冰霜護盾：可承受最大生命值<color=#3cff28>{0}</color>的傷害。", ["desc"]="冰霜護盾：可承受一定傷害。",
["tips_desc"]="冰霜護盾：可承受一定傷害。",
["name"]="shield_ice_02" ["name"]="shield_ice_02"
}, },
[81]={ [81]={
["id"]=81, ["id"]=81,
["show_name"]="技能增傷", ["show_name"]="技能增傷",
["desc"]="技能增傷：所有技能傷害增加", ["desc"]="技能增傷：所有技能傷害增加",
["tips_desc"]="技能增傷：所有技能傷害增加",
["name"]="skill_hurt_add_show" ["name"]="skill_hurt_add_show"
},
[82]={
["id"]=82,
["desc"]="反傷護盾：可承受一定傷害，反彈對方大量傷害。",
["tips_desc"]="反傷護盾2：可承受一定傷害，反彈對方大量傷害。",
["name"]="shield_rebound_200"
},
[83]={
["id"]=83,
["desc"]="反傷護盾：可承受一定傷害，反彈對方傷害。",
["tips_desc"]="反傷護盾：可承受一定傷害，反彈對方傷害。",
["name"]="shield_rebound_100"
} }
} }
local keys = { local keys = {
@ -219,12 +258,14 @@ local keys = {
["shield_ice_rebound_400"]=buff[75], ["shield_ice_rebound_400"]=buff[75],
["invincible_shield"]=buff[79], ["invincible_shield"]=buff[79],
["shield_ice_02"]=buff[80], ["shield_ice_02"]=buff[80],
["skill_hurt_add_show"]=buff[81] ["skill_hurt_add_show"]=buff[81],
["shield_rebound_200"]=buff[82],
["shield_rebound_100"]=buff[83]
} }
} }
local config = { local config = {
data=buff, data=buff,
keys=keys, keys=keys,
count=33 count=35
} }
return config return config

5
lua/app/config/strings/zh/global.lua
View File

@ -362,7 +362,7 @@ local localization_global =
["DUNGEON_WEAPON_DESC_7"] = "攻略", ["DUNGEON_WEAPON_DESC_7"] = "攻略",
["DUNGEON_WEAPON_DESC_8"] = "首領攻略", ["DUNGEON_WEAPON_DESC_8"] = "首領攻略",
["DUNGEON_WEAPON_DESC_9"] = "近期通關", ["DUNGEON_WEAPON_DESC_9"] = "近期通關",
["DUNGEON_WEAPON_DESC_10"] = "隊伍等級{0}開啟", ["DUNGEON_WEAPON_DESC_10"] = "玩家等級{0}開啟",
["DUNGEON_WEAPON_DESC_11"] = "通關前一章開啟", ["DUNGEON_WEAPON_DESC_11"] = "通關前一章開啟",
["EQUIP_DESC_1"] = "武器", ["EQUIP_DESC_1"] = "武器",
["EQUIP_DESC_2"] = "防具", ["EQUIP_DESC_2"] = "防具",
@ -419,10 +419,11 @@ local localization_global =
["DUNGEON_ARMOR_FUND_2"] = "時空裂隙基金Ⅱ", ["DUNGEON_ARMOR_FUND_2"] = "時空裂隙基金Ⅱ",
["DUNGEON_ARMOR_DESC_15"] = "請先購買本基金", ["DUNGEON_ARMOR_DESC_15"] = "請先購買本基金",
["DUNGEON_ARMOR_DESC_16"] = "超值", ["DUNGEON_ARMOR_DESC_16"] = "超值",
["MOP_UP_DESC_3"] = "足夠", ["MOP_UP_DESC_3"] = "不足",
["DUNGEON_ARMOR_DESC_17"] = "本關今日剩餘次數：{0}", ["DUNGEON_ARMOR_DESC_17"] = "本關今日剩餘次數：{0}",
["NAVER_SETTING_DESC"] = "Naver", ["NAVER_SETTING_DESC"] = "Naver",
["EQUIP_DESC_26"] = "4件防具+{0}:", ["EQUIP_DESC_26"] = "4件防具+{0}:",
["BATTLE_DESC_14"] = "有尚未完成的戰鬥，是否繼續？",
} }
return localization_global return localization_global

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

@ -357,7 +357,7 @@ local skill_rogue = {
["desc"]="雷神之鎚使用後隨機增加一種技能的能量<color=#3cff28>2</color>點。" ["desc"]="雷神之鎚使用後隨機增加一種技能的能量<color=#3cff28>2</color>點。"
}, },
[2400203]={ [2400203]={
["desc"]="雷神之鎚可隨機消除<color=#3cff28>2</color>個元素。" ["desc"]="雷神之鎚隨機消除元素<color=#3cff28>+2</color>。"
}, },
[2400204]={ [2400204]={
["desc"]="索爾普攻時有<color=#3cff28>10%</color>機率附帶<color=#3cff28>虛弱</color>效果，<color=#3cff28>1</color>回合。" ["desc"]="索爾普攻時有<color=#3cff28>10%</color>機率附帶<color=#3cff28>虛弱</color>效果，<color=#3cff28>1</color>回合。"
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="美麗夢魘沿X方向可額外消除<color=#3cff28>4</color>格。" ["desc"]="美麗夢魘沿X方向可額外消除<color=#3cff28>4</color>格。"
}, },
[3400204]={ [3400204]={
["desc"]="美麗夢魘附帶的<color=#3cff28>昏睡</color>效果，機率提高到<color=#3cff28>100%</color>。" ["desc"]="美麗夢魘附帶的<color=#3cff28>昏睡</color>效果，機率提高到<color=#3cff28>80%</color>。"
}, },
[3400205]={ [3400205]={
["desc"]="<color=#fcff28>Combo</color>:夢魔普攻<color=#3cff28>昏睡</color>敵人將附帶<color=#3cff28>禁錮</color>效果，<color=#3cff28>2</color>回合。" ["desc"]="<color=#fcff28>Combo</color>:夢魔普攻<color=#3cff28>昏睡</color>敵人將附帶<color=#3cff28>禁錮</color>效果，<color=#3cff28>2</color>回合。"

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

@ -33,8 +33,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=4, ["num"]=16,
["num_for_nothing"]="Ug==" ["num_for_nothing"]="Vw4="
} }
}, },
["box_lv_3"]={ ["box_lv_3"]={
@ -51,8 +51,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=8, ["num"]=20,
["num_for_nothing"]="Xg==" ["num_for_nothing"]="VAg="
} }
}, },
["box_lv_4"]={ ["box_lv_4"]={
@ -69,8 +69,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=12, ["num"]=24,
["num_for_nothing"]="Vwo=" ["num_for_nothing"]="VAw="
} }
}, },
["box_lv_5"]={ ["box_lv_5"]={
@ -87,8 +87,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=16, ["num"]=28,
["num_for_nothing"]="Vw4=" ["num_for_nothing"]="VAA="
} }
}, },
["box_lv_6"]={ ["box_lv_6"]={
@ -105,8 +105,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=20, ["num"]=32,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VQo="
} }
}, },
["box_lv_7"]={ ["box_lv_7"]={
@ -123,8 +123,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=24, ["num"]=36,
["num_for_nothing"]="VAw=" ["num_for_nothing"]="VQ4="
} }
}, },
["box_lv_8"]={ ["box_lv_8"]={
@ -141,8 +141,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=28, ["num"]=40,
["num_for_nothing"]="VAA=" ["num_for_nothing"]="Ugg="
} }
}, },
["box_lv_9"]={ ["box_lv_9"]={
@ -159,8 +159,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=32, ["num"]=44,
["num_for_nothing"]="VQo=" ["num_for_nothing"]="Ugw="
} }
}, },
["box_lv_10"]={ ["box_lv_10"]={
@ -177,8 +177,8 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=4, ["id"]=4,
["id_for_nothing"]="Ug==", ["id_for_nothing"]="Ug==",
["num"]=36, ["num"]=48,
["num_for_nothing"]="VQ4=" ["num_for_nothing"]="UgA="
} }
} }
}, },
@ -227,51 +227,123 @@ local summon = {
} }
}, },
["box_lv_2"]={ ["box_lv_2"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=10, ["num"]=15,
["num_for_nothing"]="Vwg=" ["num_for_nothing"]="Vw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
}, },
["box_lv_3"]={ ["box_lv_3"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=20, ["num"]=25,
["num_for_nothing"]="VAg=" ["num_for_nothing"]="VA0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
}, },
["box_lv_4"]={ ["box_lv_4"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=35, ["num"]=40,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
}, },
["box_lv_5"]={ ["box_lv_5"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=50, ["num"]=55,
["num_for_nothing"]="Uwg=" ["num_for_nothing"]="Uw0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
}, },
["box_lv_6"]={ ["box_lv_6"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
}, },
@ -280,16 +352,32 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=65, ["num"]=70,
["num_for_nothing"]="UA0=" ["num_for_nothing"]="UQg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
}, },
["box_lv_7"]={ ["box_lv_7"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=2, ["num"]=2,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VA=="
}, },
@ -298,16 +386,32 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=80, ["num"]=85,
["num_for_nothing"]="Xgg=" ["num_for_nothing"]="Xg0="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
}, },
["box_lv_8"]={ ["box_lv_8"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
}, },
@ -316,16 +420,32 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=95, ["num"]=100,
["num_for_nothing"]="Xw0=" ["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
}, },
["box_lv_9"]={ ["box_lv_9"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=4, ["num"]=4,
["num_for_nothing"]="Ug==" ["num_for_nothing"]="Ug=="
}, },
@ -334,16 +454,32 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=110, ["num"]=115,
["num_for_nothing"]="Vwlc" ["num_for_nothing"]="VwlZ"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
}, },
["box_lv_10"]={ ["box_lv_10"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -352,8 +488,16 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=125, ["num"]=130,
["num_for_nothing"]="VwpZ" ["num_for_nothing"]="Vwtc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=180,
["num_for_nothing"]="VwBc"
} }
} }
}, },
@ -387,8 +531,8 @@ local summon = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=47,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug8=",
["num"]=1, ["num"]=1,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="Vw=="
}, },
@ -413,26 +557,16 @@ local summon = {
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=1, ["num"]=2000,
["num_for_nothing"]="Vw==" ["num_for_nothing"]="VAhcAw=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=47,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Ug8=",
["num"]=5,
["num_for_nothing"]="Uw=="
}
},
["box_lv_3"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=2, ["num"]=2,
["num_for_nothing"]="VA==" ["num_for_nothing"]="VA=="
}, },
@ -441,16 +575,32 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=35, ["num"]=10,
["num_for_nothing"]="VQ0=" ["num_for_nothing"]="Vwg="
} },
},
["box_lv_4"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=4,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
}
},
["box_lv_3"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=3, ["num"]=3,
["num_for_nothing"]="VQ==" ["num_for_nothing"]="VQ=="
}, },
@ -459,16 +609,32 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=75, ["num"]=40,
["num_for_nothing"]="UQ0=" ["num_for_nothing"]="Ugg="
} },
},
["box_lv_5"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=4,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
}
},
["box_lv_4"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=4, ["num"]=4,
["num_for_nothing"]="Ug==" ["num_for_nothing"]="Ug=="
}, },
@ -477,16 +643,32 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=115, ["num"]=80,
["num_for_nothing"]="VwlZ" ["num_for_nothing"]="Xgg="
} },
},
["box_lv_6"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=4,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
}
},
["box_lv_5"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=5, ["num"]=5,
["num_for_nothing"]="Uw==" ["num_for_nothing"]="Uw=="
}, },
@ -495,80 +677,186 @@ local summon = {
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=155, ["num"]=120,
["num_for_nothing"]="Vw1Z" ["num_for_nothing"]="Vwpc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
}
},
["box_lv_6"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=6,
["num_for_nothing"]="UA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["num"]=160,
["num_for_nothing"]="Vw5c"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
} }
}, },
["box_lv_7"]={ ["box_lv_7"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=7, ["num"]=2000,
["num_for_nothing"]="UQ==" ["num_for_nothing"]="VAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=8,
["num_for_nothing"]="Xg=="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=195, ["num"]=200,
["num_for_nothing"]="VwFZ" ["num_for_nothing"]="VAhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
} }
}, },
["box_lv_8"]={ ["box_lv_8"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=9, ["num"]=2000,
["num_for_nothing"]="Xw==" ["num_for_nothing"]="VAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=10,
["num_for_nothing"]="Vwg="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=235, ["num"]=240,
["num_for_nothing"]="VAtZ" ["num_for_nothing"]="VAxc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
} }
}, },
["box_lv_9"]={ ["box_lv_9"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=11, ["num"]=2000,
["num_for_nothing"]="Vwk=" ["num_for_nothing"]="VAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=12,
["num_for_nothing"]="Vwo="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=275, ["num"]=280,
["num_for_nothing"]="VA9Z" ["num_for_nothing"]="VABc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
} }
}, },
["box_lv_10"]={ ["box_lv_10"]={
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=6, ["id"]=1,
["id_for_nothing"]="UA==", ["id_for_nothing"]="Vw==",
["num"]=13, ["num"]=2000,
["num_for_nothing"]="Vws=" ["num_for_nothing"]="VAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=14,
["num_for_nothing"]="Vww="
}, },
{ {
["type"]=1, ["type"]=1,
["type_for_nothing"]="Vw==", ["type_for_nothing"]="Vw==",
["id"]=5, ["id"]=5,
["id_for_nothing"]="Uw==", ["id_for_nothing"]="Uw==",
["num"]=315, ["num"]=320,
["num_for_nothing"]="VQlZ" ["num_for_nothing"]="VQpc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=4,
["id_for_nothing"]="Ug==",
["num"]=480,
["num_for_nothing"]="UgBc"
} }
} }
} }

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

@ -204,7 +204,7 @@ local task_daily_challenge = {
}, },
[8]={ [8]={
["rand_type"]=2, ["rand_type"]=2,
["param"]=3000, ["param"]=2500,
["reward"]={ ["reward"]={
{ {
["type"]=1, ["type"]=1,

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

@ -800,6 +800,23 @@ function GFunc.getRewardsStr(rewards)
return itemStr return itemStr
end end
function GFunc.getItemRewardsStr(rewards)
if rewards == nil then
return
end
local itemStr = ""
for k, v in ipairs(rewards) do
if v.type == GConst.REWARD_TYPE.ITEM then
itemStr = itemStr .. v.item.id .. ":" .. v.item.count
end
if k ~= #rewards then
itemStr = itemStr.. "|"
end
end
return itemStr
end
function GFunc.copyStr(str) function GFunc.copyStr(str)
CS.UnityEngine.GUIUtility.systemCopyBuffer = str CS.UnityEngine.GUIUtility.systemCopyBuffer = str
end end

4
lua/app/module/activity/activity_manager.lua
View File

@ -1,7 +1,7 @@
local ActivityManager = class("ActivityManager", BaseModule) local ActivityManager = class("ActivityManager", BaseModule)
function ActivityManager:showGoldPigUI() function ActivityManager:showGoldPigUI(showType)
UIManager:showUI("app/ui/activity/gold_pig/gold_pig_ui") UIManager:showUI("app/ui/activity/gold_pig/gold_pig_ui", {showType = showType})
end end
function ActivityManager:buyGoldPig(id) function ActivityManager:buyGoldPig(id)

2
lua/app/module/arena/arena_bounty_manager.lua
View File

@ -40,6 +40,8 @@ function ArenaBountyManager:onClaimReward(result)
end end
if isSpecialBox then if isSpecialBox then
ModuleManager.ShopManager:showBoxOpenUI({type = GConst.ShopConst.BOX_REWARD_TYPE.ARENA_BOUNTY, params = rewardId, rewards = result.rewards}) ModuleManager.ShopManager:showBoxOpenUI({type = GConst.ShopConst.BOX_REWARD_TYPE.ARENA_BOUNTY, params = rewardId, rewards = result.rewards})
local openType = BIReport.BOX_OPEN_OPEN_TYPE.ARENA_BOUNTY
BIReport:postBoxOpen(rewardId, BIReport.BOX_OPEN_BOX_TYPE.ACTIVITY, openType, 0, result.rewards)
else else
GFunc.showRewardBox(result.rewards) GFunc.showRewardBox(result.rewards)
end end

4
lua/app/module/arena/arena_manager.lua
View File

@ -225,8 +225,8 @@ function ArenaManager:rspAdBoxReward(result)
end end
end end
function ArenaManager:showGiftPopUI() function ArenaManager:showGiftPopUI(showType)
UIManager:showUI("app/ui/arena/arena_pop_gift_ui") UIManager:showUI("app/ui/arena/arena_pop_gift_ui", {showType = showType})
end end
return ArenaManager return ArenaManager

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

@ -341,6 +341,8 @@ local BUFF_NAME = {
INVINCIBLE_SHIELD = "invincible_shield", INVINCIBLE_SHIELD = "invincible_shield",
SHIELD_ICE_02 = "shield_ice_02", SHIELD_ICE_02 = "shield_ice_02",
SKILL_HURT_ADD_SHOW = "skill_hurt_add_show", SKILL_HURT_ADD_SHOW = "skill_hurt_add_show",
SHIELD_ICE_REBOUND_200 = "shield_ice_rebound_200",
SHIELD_REBOUND_100 = "shield_rebound_100",
} }
BattleConst.BUFF_NAME = BUFF_NAME BattleConst.BUFF_NAME = BUFF_NAME

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

@ -124,6 +124,10 @@ function BattleUnitComp:initWithEntity(modelId, entity, battleController, target
self:initHitAniInfo() self:initHitAniInfo()
end end
function BattleUnitComp:getSide()
return self.side
end
function BattleUnitComp:initHitAniInfo() function BattleUnitComp:initHitAniInfo()
self.hurtAniNameList = {} self.hurtAniNameList = {}
self.hurtAniNameCount = 0 self.hurtAniNameCount = 0

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

@ -11,6 +11,7 @@ local BATTLE_INSTRUCTIONS_HELPER = require "app/module/battle/helper/battle_inst
local BattleBoardTouchHelper = require "app/module/battle/helper/battle_board_touch_helper" local BattleBoardTouchHelper = require "app/module/battle/helper/battle_board_touch_helper"
local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle" local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle"
local BATTLE_SNAPSHOT_HELPER = require "app/module/battle/helper/battle_snapshot_helper" local BATTLE_SNAPSHOT_HELPER = require "app/module/battle/helper/battle_snapshot_helper"
local BattleFormula = require "app/module/battle/helper/battle_formula"
local BattleBaseController = class("BattleBaseController") local BattleBaseController = class("BattleBaseController")
local BattleConst = GConst.BattleConst local BattleConst = GConst.BattleConst
local BUFF_NAME_TO_ATTR = BattleConst.BUFF_NAME_TO_ATTR local BUFF_NAME_TO_ATTR = BattleConst.BUFF_NAME_TO_ATTR
@ -245,13 +246,18 @@ function BattleBaseController:onLinkChange()
local sequence = self.battleData:getGridSequence() local sequence = self.battleData:getGridSequence()
local mainElementType local mainElementType
local dmgSkillId
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)
if not mainElementType then if not mainElementType or not dmgSkillId then
local skillId = entity:getSkillId() local skillId = entity:getSkillId()
if not skillId then if not skillId and not mainElementType then
mainElementType = entity:getElementType() mainElementType = entity:getElementType()
end
if skillId and not dmgSkillId then
dmgSkillId = skillId
end
if mainElementType and dmgSkillId then
break break
end end
end end
@ -298,8 +304,10 @@ function BattleBaseController:onLinkChange()
end end
end end
local dmgElementTypeMap
if not self:getCurActionUnitComp():getActiveSkillLimit() then if not self:getCurActionUnitComp():getActiveSkillLimit() then
local aniSequence, influenceElementType, lineCount, elementTypeMap, linkElementType, effectGridMap, randomPosList = self:calculateCurElimination(true) local aniSequence, influenceElementType, lineCount, elementTypeMap, linkElementType, effectGridMap, randomPosList = self:calculateCurElimination(true)
dmgElementTypeMap = elementTypeMap
if randomPosList then if randomPosList then
for _, posId in ipairs(randomPosList) do for _, posId in ipairs(randomPosList) do
local gridEntity = self.battleData:getGridEntity(posId) local gridEntity = self.battleData:getGridEntity(posId)
@ -317,6 +325,22 @@ function BattleBaseController:onLinkChange()
if mainElementType then if mainElementType then
self:getSideTeam(self.curActionSide):changeMainUnit(mainElementType) self:getSideTeam(self.curActionSide):changeMainUnit(mainElementType)
end end
local elementTypeCount = 0
for element, count in pairs(dmgElementTypeMap) do
elementTypeCount = elementTypeCount + count
end
local dmg = self:calExpectedInjury(mainElementType, elementTypeCount, dmgSkillId)
local defMainUnitcomp = self:getCurOtherActionUnitComp()
if defMainUnitcomp then
local hp = defMainUnitcomp.unitEntity:getHp()
local hpPercent = (hp - dmg) / defMainUnitcomp.unitEntity:getMaxHp()
if self.curActionSide == SIDE_ATK then
self.battleUI:setDefHp(hp, hpPercent)
else
self.battleUI:setAtkHp(hp, hpPercent)
end
end
end end
function BattleBaseController:getInitBoard() function BattleBaseController:getInitBoard()
@ -724,8 +748,21 @@ function BattleBaseController:getCurActionUnitComp()
return self:getCurActionTeam():getMainUnit() return self:getCurActionTeam():getMainUnit()
end end
function BattleBaseController:getCurActionBoardRowRange() function BattleBaseController:getCurOtherActionUnitComp()
local isAtkAction = self.curActionSide == SIDE_ATK local side = self:getCurActionOtherSide()
if not side then
return
end
local team = self:getCurActionTeam(side)
if not team then
return
end
return team:getMainUnit()
end
function BattleBaseController:getCurActionBoardRowRange(side)
side = side or self.curActionSide
local isAtkAction = side == SIDE_ATK
if isAtkAction then if isAtkAction then
return self:getAtkMinRow() + 1, self:getRowCount() return self:getAtkMinRow() + 1, self:getRowCount()
else else
@ -743,6 +780,16 @@ function BattleBaseController:getPosIdInCurActionBoardRowRange(posId)
return true return true
end end
function BattleBaseController:getPosIdInActionBoardRowRange(side, posId)
local min, max = self:getCurActionBoardRowRange(side)
local r = ModuleManager.BattleManager:getPosRC(posId).r
if r < min or r > max then
return false
end
return true
end
function BattleBaseController:onLoadComplete() function BattleBaseController:onLoadComplete()
UIManager:closeLoading() UIManager:closeLoading()
self:handleBuffs() self:handleBuffs()
@ -1166,6 +1213,14 @@ function BattleBaseController:clearGridSequence()
end end
function BattleBaseController:onLinkOver() function BattleBaseController:onLinkOver()
local hp = self.atkTeam:getMainUnit().unitEntity:getHp()
local hpPercent = self.atkTeam:getMainUnit().unitEntity:getHpPercent()
self.battleUI:setAtkHp(hp, hpPercent)
local hp = self.defTeam:getMainUnit().unitEntity:getHp()
local hpPercent = self.defTeam:getMainUnit().unitEntity:getHpPercent()
self.battleUI:setDefHp(hp, hpPercent)
self.battleUI:hideAllSfxLine() self.battleUI:hideAllSfxLine()
local sequence = self.battleData:getGridSequence() local sequence = self.battleData:getGridSequence()
local count = #sequence local count = #sequence
@ -2271,14 +2326,21 @@ function BattleBaseController:selectSKillNextToStep()
end end
function BattleBaseController:changeElementType(count, elementType) function BattleBaseController:changeElementType(count, elementType, side)
self.changeElementTypeMap = table.clearOrCreate(self.changeElementTypeMap) self.changeElementTypeMap = table.clearOrCreate(self.changeElementTypeMap)
self.changeElementTypeList = table.clearOrCreate(self.changeElementTypeList) self.changeElementTypeList = table.clearOrCreate(self.changeElementTypeList)
local listCount = 0 local listCount = 0
for _, entity in pairs(self.battleData:getGridEnties()) do for _, entity in pairs(self.battleData:getGridEnties()) do
if entity:canChangeInfo() and entity:getElementType() ~= elementType then if entity:canChangeInfo() and entity:getElementType() ~= elementType then
table.insert(self.changeElementTypeList, entity) if side then
listCount = listCount + 1 if self:getPosIdInActionBoardRowRange(side, entity:getPosId()) then
table.insert(self.changeElementTypeList, entity)
listCount = listCount + 1
end
else
table.insert(self.changeElementTypeList, entity)
listCount = listCount + 1
end
end end
end end
@ -2408,7 +2470,7 @@ function BattleBaseController:shuffleBoard(callback)
else else
self.resetList = table.clearOrCreate(self.resetList) self.resetList = table.clearOrCreate(self.resetList)
for posId, entity in pairs(self.battleData:getGridEnties()) do for posId, entity in pairs(self.battleData:getGridEnties()) do
if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() then if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() and not entity:getCantUpset() then
table.insert(self.resetList, entity) table.insert(self.resetList, entity)
end end
end end
@ -2457,7 +2519,7 @@ function BattleBaseController:getShuffleBoardInfo()
end end
local anySkillCount = 0 local anySkillCount = 0
for posId, entity in pairs(self.battleData:getGridEnties()) do for posId, entity in pairs(self.battleData:getGridEnties()) do
if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() then if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() and not entity:getCantUpset() then
if entity:getSkillId() then if entity:getSkillId() then
local skillEntity = self:getSkillEntityBySkillId(entity:getSkillId()) local skillEntity = self:getSkillEntityBySkillId(entity:getSkillId())
local elementType = skillEntity:getPosition() local elementType = skillEntity:getPosition()
@ -3139,4 +3201,21 @@ BattleBaseController._doInstruction = {
[BattleConst.INSTRUCTION_NAME.PLAY_SKILL] = _playSkill, [BattleConst.INSTRUCTION_NAME.PLAY_SKILL] = _playSkill,
} }
function BattleBaseController:calExpectedInjury(mainElementType, count, skillId)
local atkCompMap = self:getCurActionTeam():getUnitComp()
if not atkCompMap then
return 0
end
local atkUnitComp = atkCompMap[mainElementType]
if mainElementType and not atkUnitComp then
return 0
end
if not mainElementType or not atkUnitComp then
count = 0
atkUnitComp = self:getCurActionTeam():getMainUnit()
end
local dmg = BattleFormula:getExpectedDamageResult(atkUnitComp, count, self:getCurOtherActionUnitComp(), skillId, atkCompMap)
return dmg
end
return BattleBaseController return BattleBaseController

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

@ -159,6 +159,20 @@ BattleBuffHandle.addShield = {
target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, 40000, false) target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, 40000, false)
return shieldNum return shieldNum
end, end,
-- 反弹目标伤害的200%，直接写死
[BUFF_NAME.SHIELD_ICE_REBOUND_200] = function(unitComp, buff, target, buffEffect)
local shieldNum = target.unitEntity:getMaxHp() * buff:getEffectNum() // DEFAULT_FACTOR
target:addShield(shieldNum, buffEffect)
target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, 20000, false)
return shieldNum
end,
-- 反弹目标伤害的100%，直接写死
[BUFF_NAME.SHIELD_REBOUND_100] = function(unitComp, buff, target, buffEffect)
local shieldNum = target.unitEntity:getMaxHp() * buff:getEffectNum() // DEFAULT_FACTOR
target:addShield(shieldNum, buffEffect)
target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, 10000, false)
return shieldNum
end,
} }
BattleBuffHandle.removeShield = { BattleBuffHandle.removeShield = {
@ -174,6 +188,14 @@ BattleBuffHandle.removeShield = {
target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, -40000, false) target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, -40000, false)
target:removeShield(buffEffect) target:removeShield(buffEffect)
end, end,
[BUFF_NAME.SHIELD_ICE_REBOUND_200] = function(buffSender, target, buff, buffEffect)
target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, -20000, false)
target:removeShield(buffEffect)
end,
[BUFF_NAME.SHIELD_REBOUND_100] = function(buffSender, target, buff, buffEffect)
target.unitEntity:addAttr(ATTR_NAME.SHIELD_REBOUND, -10000, false)
target:removeShield(buffEffect)
end,
} }
local function _takeEffectShield(unitComp, buff, target, buffEffect) local function _takeEffectShield(unitComp, buff, target, buffEffect)

31
lua/app/module/battle/helper/battle_formula.lua
View File

@ -14,6 +14,37 @@ function BattleFormula:getDamageOrCureResult(unitComp, buff, targetUnitComp)
return 0 return 0
end end
function BattleFormula:getExpectedDamageResult(unitComp, count, targetUnitComp, skillId, atkCompMap)
-- (元素个数*攻击者攻击力+链接技能的伤害) * 受击者伤害减免
-- 普攻
local result = unitComp.unitEntity:getAtk() * count
local atkMatchType = unitComp.unitEntity:getMatchType()
local coefficient = math.max(DEFAULT_FACTOR - targetUnitComp.unitEntity:getDecDmg(atkMatchType), 0)
result = result * coefficient // DEFAULT_FACTOR
-- 技能
if skillId and atkCompMap then
local skillConfig = ConfigManager:getConfig("skill")[skillId]
if skillConfig and skillConfig.effect and skillConfig.position then
local matchType = skillConfig.position
if atkCompMap[matchType] then
local atk = atkCompMap[matchType].unitEntity:getAtk()
local dmg = 0
for _, effect in ipairs(skillConfig.effect) do
local buffConfig = ConfigManager:getConfigWithOtherKey("buff", "name")[effect.type]
if buffConfig and buffConfig.formula == 1 then -- 伤害公式
dmg = dmg + effect.num * atk
end
end
local coefficient = math.max(DEFAULT_FACTOR - targetUnitComp.unitEntity:getDecDmg(atkMatchType), 0)
result = result + (dmg * coefficient // DEFAULT_FACTOR) // DEFAULT_FACTOR
end
end
end
-- 最终伤害
result = result * (DEFAULT_FACTOR - unitComp.unitEntity:getEndDmgDecAll() + unitComp.unitEntity:getEndDmgAddtionAll()) // DEFAULT_FACTOR
return result
end
BattleFormula.calculateFormula = { BattleFormula.calculateFormula = {
-- (（攻击）*技能倍率*(1+(攻击者元素伤害增加+所有伤害增加）（攻击者）- (攻击者元素伤害降低+所有伤害降低) +(受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击） + 主动技能增伤) + 固定值) *暴击伤害*(1-最终造成伤害降低%+最终造成伤害增加%) -- (（攻击）*技能倍率*(1+(攻击者元素伤害增加+所有伤害增加）（攻击者）- (攻击者元素伤害降低+所有伤害降低) +(受到元素伤害增加+受到所有伤害增加（受击）-受到元素伤害降低-受到所有伤害降低（受击） + 主动技能增伤) + 固定值) *暴击伤害*(1-最终造成伤害降低%+最终造成伤害增加%)
[1] = function(unitComp, buff, targetUnit) [1] = function(unitComp, buff, targetUnit)

20
lua/app/module/battle/helper/battle_snapshot_helper.lua
View File

@ -77,6 +77,11 @@ function BattleSnapshotHelper:snapshotBattleInfo(battleBaseController)
battleBaseController.snapShotInfo.atkSkillMap[tostring(skillId)] = info battleBaseController.snapShotInfo.atkSkillMap[tostring(skillId)] = info
end end
battleBaseController.snapShotInfo.atkSkillEnergy = table.clearOrCreate(battleBaseController.snapShotInfo.atkSkillEnergy)
for elementType, skillEntity in pairs(battleBaseController.battleData:getSkillEntities(SIDE_ATK)) do
battleBaseController.snapShotInfo.atkSkillEnergy[tostring(elementType)] = skillEntity:getEnergy()
end
-- BattleBaseData -- BattleBaseData
battleBaseController.snapShotInfo.battledataShopInfo = battleBaseController.battleData:getSnapshoptInfo() battleBaseController.snapShotInfo.battledataShopInfo = battleBaseController.battleData:getSnapshoptInfo()
@ -216,12 +221,23 @@ function BattleSnapshotHelper:dealSnapshotBattleExtraInfo(battleBaseController,
end end
end end
end end
end
if battleBaseController.battleUI then local atkSkillEnergy = snapshot.atkSkillEnergy
battleBaseController.battleUI:refreshSkill(nil, nil, SIDE_ATK) if atkSkillEnergy then
local skillMap = battleBaseController.battleData:getSkillEntities(SIDE_ATK)
for matchTypeStr, count in pairs(atkSkillEnergy) do
local matchType = tonumber(matchTypeStr)
if matchType and skillMap[matchType] then
skillMap[matchType]:addEnergy(count)
end
end end
end end
if battleBaseController.battleUI then
battleBaseController.battleUI:refreshSkill(nil, nil, SIDE_ATK)
end
-- buff -- buff
local atkBuff = snapshot.atkBuff local atkBuff = snapshot.atkBuff
if atkBuff then if atkBuff then

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

@ -449,7 +449,7 @@ local function _takeChangeElementType(atkUnitComp, skillEntity, battleController
local elementType = params[1] local elementType = params[1]
local changeCount = params[2] local changeCount = params[2]
battleController:changeElementType(changeCount, elementType) battleController:changeElementType(changeCount, elementType, atkUnitComp and atkUnitComp:getSide())
end end

1
lua/app/module/battle/team/battle_team.lua
View File

@ -660,6 +660,7 @@ function BattleTeam:onActionOver()
skillMatch = self:getMainUnit().unitEntity:getMatchType() skillMatch = self:getMainUnit().unitEntity:getMatchType()
else else
self.battleController.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_DEF_STEP self.battleController.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_DEF_STEP
skillMatch = self:getMainUnit().unitEntity:getMatchType()
end end
self:useNormalSkill(skillMatch, counterAttackCount, true, BattleConst.EFFECT_TYPE.DIRECT, BattleConst.ATTACK_ACTION_STATE.COUNTERATTACK, function() self:useNormalSkill(skillMatch, counterAttackCount, true, BattleConst.EFFECT_TYPE.DIRECT, BattleConst.ATTACK_ACTION_STATE.COUNTERATTACK, function()

2
lua/app/module/bounty/bounty_manager.lua
View File

@ -40,6 +40,8 @@ function BountyManager:onClaimReward(result)
end end
if isSpecialBox then if isSpecialBox then
ModuleManager.ShopManager:showBoxOpenUI({type = GConst.ShopConst.BOX_REWARD_TYPE.BOUNTY, params = rewardId, rewards = result.rewards}) ModuleManager.ShopManager:showBoxOpenUI({type = GConst.ShopConst.BOX_REWARD_TYPE.BOUNTY, params = rewardId, rewards = result.rewards})
local openType = BIReport.BOX_OPEN_OPEN_TYPE.BOUNTY
BIReport:postBoxOpen(rewardId, BIReport.BOX_OPEN_BOX_TYPE.ACTIVITY, openType, 0, result.rewards)
else else
GFunc.showRewardBox(result.rewards) GFunc.showRewardBox(result.rewards)
end end

1
lua/app/module/common/common_manager.lua
View File

@ -10,6 +10,7 @@ function CommonManager:showMopUpUI(rewards, remainCount, callback, customtitleTx
---- 有目标的扫荡 可为nil ---- 有目标的扫荡 可为nil
target = target, target = target,
} }
AudioManager:playEffect(AudioManager.EFFECT_ID.DUNGEON_SMASH)
UIManager:showUI("app/ui/common/mop_up_ui", params) UIManager:showUI("app/ui/common/mop_up_ui", params)
end end

14
lua/app/module/dungeon/dungeon_manager.lua
View File

@ -93,8 +93,15 @@ end
-- 响应结算金币副本 -- 响应结算金币副本
function DungeonManager:respEndChallengeGold(result) function DungeonManager:respEndChallengeGold(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
local passId = DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_GOLD)
DataManager.DungeonData:initDungeonGold(result.gold_challenge) DataManager.DungeonData:initDungeonGold(result.gold_challenge)
ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, result.rewards, result.reqData.combatReport) ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_GOLD, result.rewards, result.reqData.combatReport)
if passId ~= DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_GOLD) then
local data = {}
data.dungeon_progress = DataManager.DungeonData:getDungeonBIStr()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
end
end end
end end
@ -182,8 +189,15 @@ end
-- 响应结算碎片副本 -- 响应结算碎片副本
function DungeonManager:respEndChallengeShards(result) function DungeonManager:respEndChallengeShards(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
local passId = DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS)
DataManager.DungeonData:initDungeonShards(result.shards_challenge) DataManager.DungeonData:initDungeonShards(result.shards_challenge)
ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, result.rewards, result.reqData and result.reqData.combatReport or {}) ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_SHARDS, result.rewards, result.reqData and result.reqData.combatReport or {})
if passId ~= DataManager.DungeonData:getPassedMaxId(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) then
local data = {}
data.dungeon_progress = DataManager.DungeonData:getDungeonBIStr()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
end
end end
end end

7
lua/app/module/dungeon_armor/dungeon_armor_manager.lua
View File

@ -94,11 +94,18 @@ end
function DungeonArmorManager:rspEndChallenge(result) function DungeonArmorManager:rspEndChallenge(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
local armorData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR) local armorData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR)
local passId = armorData:getPassedMaxId()
if result.reqData then if result.reqData then
armorData:refreshInfoOnSettlement(result.reqData.chapter_armor_id, result) armorData:refreshInfoOnSettlement(result.reqData.chapter_armor_id, result)
end end
ModuleManager.BattleManager:showBattleArmorResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_ARMOR, result.rewards, result.reqData.combatReport) ModuleManager.BattleManager:showBattleArmorResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_ARMOR, result.rewards, result.reqData.combatReport)
DataManager.DungeonData:setDirty() DataManager.DungeonData:setDirty()
if passId ~= armorData:getPassedMaxId() then
local data = {}
data.dungeon_progress = DataManager.DungeonData:getDungeonBIStr()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
end
end end
end end

22
lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua
View File

@ -20,6 +20,14 @@ function DungeonWeaponManager:reqFight(chapterId)
end end
local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON)
if weaponData:canFarmChapter(chapterId) then
if not DataManager.DungeonData:isEnoughHp(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) then
GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT)
ModuleManager.CommerceManager:showBuyVitUI()
return
end
end
if not weaponData:canFightChapter(chapterId) then if not weaponData:canFightChapter(chapterId) then
return return
end end
@ -72,6 +80,7 @@ end
function DungeonWeaponManager:rspEndChallenge(result) function DungeonWeaponManager:rspEndChallenge(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON)
local passId = weaponData:getPassedMaxId()
weaponData:refreshInfoOnSettlement(result.reqData.chapter_weapon_id, result) weaponData:refreshInfoOnSettlement(result.reqData.chapter_weapon_id, result)
local firstRewardsIdx = #result.first_rewards local firstRewardsIdx = #result.first_rewards
@ -94,6 +103,12 @@ function DungeonWeaponManager:rspEndChallenge(result)
end end
ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, resultRewards, result.reqData.combatReport, nil, firstRewardsIdx, true) ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, resultRewards, result.reqData.combatReport, nil, firstRewardsIdx, true)
DataManager.DungeonData:setDirty() DataManager.DungeonData:setDirty()
if passId ~= weaponData:getPassedMaxId() then
local data = {}
data.dungeon_progress = DataManager.DungeonData:getDungeonBIStr()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
end
end end
end end
@ -101,6 +116,13 @@ end
function DungeonWeaponManager:reqSweep(chapterId, target) function DungeonWeaponManager:reqSweep(chapterId, target)
local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON)
-- 体力
if not DataManager.DungeonData:isEnoughHp(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) then
GFunc.showItemNotEnough(GConst.ItemConst.ITEM_ID_VIT)
ModuleManager.CommerceManager:showBuyVitUI()
return
end
-- 判断次数 -- 判断次数
if weaponData:getRemianFarmCount() <= 0 then if weaponData:getRemianFarmCount() <= 0 then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_13)) GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_13))

6
lua/app/module/equip/equip_manager.lua
View File

@ -36,7 +36,11 @@ function EquipManager:reqUpgrade(id, part)
return return
end end
self:sendMessage(ProtoMsgType.FromMsgEnum.EquipUpgradeReq, {hero_id = id, position = part}, {}, self.rspUpgrade, BIReport.ITEM_GET_TYPE.EQUIP_UPGRADE) local itemGetType = BIReport.ITEM_GET_TYPE.EQUIP_UPGRADE
if part ~= GConst.EquipConst.PART_TYPE.WEAPON then
itemGetType = BIReport.ITEM_GET_TYPE.ARMOR_UPGRADE
end
self:sendMessage(ProtoMsgType.FromMsgEnum.EquipUpgradeReq, {hero_id = id, position = part}, {}, self.rspUpgrade, itemGetType)
end end
function EquipManager:rspUpgrade(result) function EquipManager:rspUpgrade(result)

2
lua/app/module/hero/hero_const.lua
View File

@ -67,6 +67,6 @@ HeroConst.SHOW_NODE =
HeroConst.TRIAL_HERO_ID = 34001 -- 花木兰 HeroConst.TRIAL_HERO_ID = 34001 -- 花木兰
HeroConst.TRIAL_HERO_MIN_CHAPTER = 2 HeroConst.TRIAL_HERO_MIN_CHAPTER = 2
HeroConst.TRIAL_HERO_MAX_CHAPTER = 4 HeroConst.TRIAL_HERO_MAX_CHAPTER = 5
return HeroConst return HeroConst

1
lua/app/module/item/item_const.lua
View File

@ -26,6 +26,7 @@ ItemConst.ITEM_TYPE = {
WEIGHT_FRAGMENT = 6, WEIGHT_FRAGMENT = 6,
RANDOM_BOX_ITEM = 7, RANDOM_BOX_ITEM = 7,
FIXED_BOX_ITEM = 8, FIXED_BOX_ITEM = 8,
EPIC_HERO_FRAMENT = 11,
} }
return ItemConst return ItemConst

8
lua/app/module/item/item_manager.lua
View File

@ -16,4 +16,12 @@ function ItemManager:getItemType(id)
return I18N:getConfig("item")[id].desc return I18N:getConfig("item")[id].desc
end end
function ItemManager:rspRecoveryNtf(result)
if result and result.id == GConst.ItemConst.ITEM_ID_VIT then
if result.count and result.count > 0 then
BIReport:postVitGet(result.count, BIReport.ITEM_GET_TYPE.OFFLINE_RECOVERY)
end
end
end
return ItemManager return ItemManager

3
lua/app/module/login/login_manager.lua
View File

@ -164,6 +164,9 @@ function LoginManager:loginFinish(data)
data.formation, data.formation_lv, data.formation_atk, data.formation_hp = DataManager.FormationData:getStageFormationBIStr() data.formation, data.formation_lv, data.formation_atk, data.formation_hp = DataManager.FormationData:getStageFormationBIStr()
data.formation_lv = nil data.formation_lv = nil
data.all_heroes = DataManager.HeroData:getAllHeroesBIStr() data.all_heroes = DataManager.HeroData:getAllHeroesBIStr()
data.dungeon_progress = DataManager.DungeonData:getDungeonBIStr()
data.game_version = DataManager.PlayerData:getGameVersion()
data.is_internal = DataManager.PlayerData:getIsInternal()
CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data) CS.ThinkingAnalytics.ThinkingAnalyticsAPI.UserSet(data)
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.LOGIN_REQ_SUCCESS) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.LOGIN_REQ_SUCCESS)

22
lua/app/module/shop/shop_manager.lua
View File

@ -32,40 +32,44 @@ function ShopManager:showBoxLevelUpUI(params)
end end
-- 触发弹窗礼包 -- 触发弹窗礼包
function ShopManager:triggerGiftPopUI(actType, actId) function ShopManager:triggerGiftPopUI(actType, actId, showType)
-- 入门礼包不在通用触发条件内 -- 入门礼包不在通用触发条件内
if (actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID) then if (actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID) then
self:showGiftPopUI(actType, actId, false) self:showGiftPopUI(actType, actId, false, showType)
DataManager.ShopData:removePopUpGift(actType, actId) DataManager.ShopData:removePopUpGift(actType, actId)
else else
if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_GIFT_SHOW_OPEN, true) then if ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.ACT_GIFT_SHOW_OPEN, true) then
self:showGiftPopUI(actType, actId, false) self:showGiftPopUI(actType, actId, false, showType)
DataManager.ShopData:removePopUpGift(actType, actId) DataManager.ShopData:removePopUpGift(actType, actId)
end end
end end
end end
function ShopManager:showGiftPopUI(actType, actId, onlySelf) function ShopManager:showGiftPopUI(actType, actId, onlySelf, showType)
if GFunc.isShenhe() then if GFunc.isShenhe() then
return return
end end
if actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.FIRST_RECHARGE_ID then if actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.FIRST_RECHARGE_ID then
UIManager:showUI("app/ui/shop/first_recharge_pop_ui") UIManager:showUI("app/ui/shop/first_recharge_pop_ui", {showType = showType})
elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID then elseif actType == PayManager.PURCHARSE_TYPE.ACT_GIFT and actId == GConst.ShopConst.INTRODUCT_GIFT_ID then
UIManager:showUI("app/ui/shop/introduct_pop_ui") UIManager:showUI("app/ui/shop/introduct_pop_ui", {showType = showType})
elseif actType == PayManager.PURCHARSE_TYPE.CHAPTER_GIFT then
UIManager:showUI("app/ui/shop/gift_pop_chapter_ui", {type = actType, id = actId, onlySelf = onlySelf})
elseif actType == PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW then
UIManager:showUI("app/ui/shop/gift_pop_grow_up_ui", {type = actType, id = actId, onlySelf = onlySelf})
else else
UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf}) UIManager:showUI("app/ui/shop/gift_pop_ui", {type = actType, id = actId, onlySelf = onlySelf, showType = showType})
end end
end end
-- 触发金币弹窗礼包 -- 触发金币弹窗礼包
function ShopManager:triggerCoinGiftPopUI(actId) function ShopManager:triggerCoinGiftPopUI(actId)
self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId) self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.ACT_GIFT, actId, BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP)
end end
-- 触发成长礼包 -- 触发成长礼包
function ShopManager:triggerGrowUpGiftPopUI(actId) function ShopManager:triggerGrowUpGiftPopUI(actId)
self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW, actId) self:triggerGiftPopUI(PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW, actId, BIReport.PAY_UI_SHOW_TYPE.TRIGGER_POP)
end end
-- 购买每日特惠商品 -- 购买每日特惠商品

7
lua/app/module/summon/summon_manager.lua
View File

@ -40,6 +40,13 @@ function SummonManager:summonFinish(result)
elseif summonType == GConst.SummonConst.SUMMON_TYPE.LV_3 then elseif summonType == GConst.SummonConst.SUMMON_TYPE.LV_3 then
ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3, 1) ModuleManager.TaskManager:addTaskProgress(GConst.TaskConst.TASK_TYPE.X_OPEN_SHOP_BOX_LEVEL_3, 1)
end end
if result.rewards then
local openType = BIReport.BOX_OPEN_OPEN_TYPE.USE_KEY
if result.reqData.consume_type ~= 1 then -- 钻石
openType = BIReport.BOX_OPEN_OPEN_TYPE.USE_GEM
end
BIReport:postBoxOpen(summonType, BIReport.BOX_OPEN_BOX_TYPE.SHOP, openType, DataManager.SummonData:getSummonLevel(), result.rewards)
end
end end
if result.summon_info.count then if result.summon_info.count then
local totalCount = 0 local totalCount = 0

6
lua/app/module/tips/tips_manager.lua
View File

@ -32,8 +32,10 @@ function TipsManager:showRewardTips(rewardId, rewardType, tarPrefabObj, alignTyp
if rewardType == GConst.REWARD_TYPE.ITEM then if rewardType == GConst.REWARD_TYPE.ITEM then
local info = ConfigManager:getConfig("item")[rewardId] local info = ConfigManager:getConfig("item")[rewardId]
if info then if info then
if info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_FRAGMENT or info.type == GConst.ItemConst.ITEM_TYPE.WEIGHT_FRAGMENT then if info.type == GConst.ItemConst.ITEM_TYPE.RANDOM_FRAGMENT
-- 随机碎片 or 权重随机碎片 or info.type == GConst.ItemConst.ITEM_TYPE.WEIGHT_FRAGMENT
or info.type == GConst.ItemConst.ITEM_TYPE.EPIC_HERO_FRAMENT then
-- 随机碎片 or 权重随机碎片 or 史诗英雄碎片
self:showHeroFragmentTips(rewardId) self:showHeroFragmentTips(rewardId)
return return
elseif info.type == GConst.ItemConst.ITEM_TYPE.BOX then elseif info.type == GConst.ItemConst.ITEM_TYPE.BOX then

3
lua/app/proto/proto_msg_type.lua
View File

@ -63,6 +63,7 @@ local ProtoMsgType = {
[1571186308] = "ChapterShardsChallengeFarmRsp", [1571186308] = "ChapterShardsChallengeFarmRsp",
[1584689751] = "ActPaidResultReq", [1584689751] = "ActPaidResultReq",
[1584691584] = "ActPaidResultRsp", [1584691584] = "ActPaidResultRsp",
[1635643251] = "RecoveryNtf",
[1646412046] = "ChapterDailyChallengeSettlementReq", [1646412046] = "ChapterDailyChallengeSettlementReq",
[1646413879] = "ChapterDailyChallengeSettlementRsp", [1646413879] = "ChapterDailyChallengeSettlementRsp",
[1651833678] = "ChapterWeaponChallengeStartReq", [1651833678] = "ChapterWeaponChallengeStartReq",
@ -264,6 +265,7 @@ local ProtoMsgType = {
ChapterShardsChallengeFarmRsp = 1571186308, ChapterShardsChallengeFarmRsp = 1571186308,
ActPaidResultReq = 1584689751, ActPaidResultReq = 1584689751,
ActPaidResultRsp = 1584691584, ActPaidResultRsp = 1584691584,
RecoveryNtf = 1635643251,
ChapterDailyChallengeSettlementReq = 1646412046, ChapterDailyChallengeSettlementReq = 1646412046,
ChapterDailyChallengeSettlementRsp = 1646413879, ChapterDailyChallengeSettlementRsp = 1646413879,
ChapterWeaponChallengeStartReq = 1651833678, ChapterWeaponChallengeStartReq = 1651833678,
@ -465,6 +467,7 @@ local ProtoMsgType = {
ChapterShardsChallengeFarmRsp = "ChapterShardsChallengeFarmRsp", ChapterShardsChallengeFarmRsp = "ChapterShardsChallengeFarmRsp",
ActPaidResultReq = "ActPaidResultReq", ActPaidResultReq = "ActPaidResultReq",
ActPaidResultRsp = "ActPaidResultRsp", ActPaidResultRsp = "ActPaidResultRsp",
RecoveryNtf = "RecoveryNtf",
ChapterDailyChallengeSettlementReq = "ChapterDailyChallengeSettlementReq", ChapterDailyChallengeSettlementReq = "ChapterDailyChallengeSettlementReq",
ChapterDailyChallengeSettlementRsp = "ChapterDailyChallengeSettlementRsp", ChapterDailyChallengeSettlementRsp = "ChapterDailyChallengeSettlementRsp",
ChapterWeaponChallengeStartReq = "ChapterWeaponChallengeStartReq", ChapterWeaponChallengeStartReq = "ChapterWeaponChallengeStartReq",

5
lua/app/ui/activity/gold_pig/gold_pig_ui.lua
View File

@ -8,8 +8,9 @@ function GoldPigUI:getPrefabPath()
return "assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab" return "assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab"
end end
function GoldPigUI:ctor() function GoldPigUI:ctor(params)
self.goldPigId = DataManager.GoldPigData:getId() self.goldPigId = DataManager.GoldPigData:getId()
self.showType = params.showType
end end
function GoldPigUI:onLoadRootComplete() function GoldPigUI:onLoadRootComplete()
@ -55,7 +56,7 @@ function GoldPigUI:onLoadRootComplete()
end end
end) end)
BIReport:postPayUIShow(BIReport.GIFT_TYPE.GOLD_PIG) BIReport:postPayUIShow(BIReport.GIFT_TYPE.GOLD_PIG, self.goldPigId, self.showType)
self.timeTx = uiMap["gold_pig_ui.bg.time_bg.time_tx"] self.timeTx = uiMap["gold_pig_ui.bg.time_bg.time_tx"]
local isFull = DataManager.GoldPigData:getIsFull() local isFull = DataManager.GoldPigData:getIsFull()

3
lua/app/ui/arena/arena_pop_gift_ui.lua
View File

@ -14,6 +14,7 @@ function GiftPopUI:ctor(params)
self.actType = PayManager.PURCHARSE_TYPE.ACT_GIFT self.actType = PayManager.PURCHARSE_TYPE.ACT_GIFT
self.actId = DataManager.ArenaData:getGiftId() self.actId = DataManager.ArenaData:getGiftId()
self.showType = params.showType
DataManager.ArenaData:cleaShowPopGift() DataManager.ArenaData:cleaShowPopGift()
end end
@ -103,7 +104,7 @@ function GiftPopUI:refresh()
-- 上报 -- 上报
local giftType = PayManager:getGiftType(self.actType, self.actId) local giftType = PayManager:getGiftType(self.actType, self.actId)
BIReport:postPayUIShow(giftType, self.actId) BIReport:postPayUIShow(giftType, self.actId, self.showType)
self:updateTime() self:updateTime()
end end

2
lua/app/ui/arena/bounty_main_ui.lua
View File

@ -63,7 +63,7 @@ function BountyMainUI:onLoadRootComplete()
end, 1) end, 1)
self:updateTime() self:updateTime()
BIReport:postPayUIShow(BIReport.GIFT_TYPE.ARENA_BOUNTY) BIReport:postPayUIShow(BIReport.GIFT_TYPE.ARENA_BOUNTY, nil, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function BountyMainUI:initTitle() function BountyMainUI:initTitle()

10
lua/app/ui/battle/battle_base_ui.lua
View File

@ -1096,6 +1096,16 @@ function BattleBaseUI:refreshDefHp(num, percent)
end end
end end
function BattleBaseUI:setAtkHp(num, percent)
self.hpTextLeft:setText(GFunc.num2Str(num))
self.hpProgressLeft.value = percent
end
function BattleBaseUI:setDefHp(num, percent)
self.hpTextRight:setText(GFunc.num2Str(num))
self.hpProgressRight.value = percent
end
function BattleBaseUI:refreshSkill(elementMap, showSfx, side) function BattleBaseUI:refreshSkill(elementMap, showSfx, side)
side = side or SIDE_ATK side = side or SIDE_ATK
if not self.skillNodeCells or not self.skillNodeCells[side] then if not self.skillNodeCells or not self.skillNodeCells[side] then

2
lua/app/ui/battle/cell/tiny_buff_cell.lua
View File

@ -1,7 +1,7 @@
local TinyBuffCell = class("TinyBuffCell", BaseCell) local TinyBuffCell = class("TinyBuffCell", BaseCell)
function TinyBuffCell:refresh(buffName, round, num, result) function TinyBuffCell:refresh(buffName, round, num, result)
if round <= 1 or round > 9 then if round <= 0 or round > 9 then
round = GConst.EMPTY_STRING round = GConst.EMPTY_STRING
else else
round = tostring(round) round = tostring(round)

2
lua/app/ui/bounty/bounty_main_ui.lua
View File

@ -63,7 +63,7 @@ function BountyMainUI:onLoadRootComplete()
end, 1) end, 1)
self:updateTime() self:updateTime()
BIReport:postPayUIShow(BIReport.GIFT_TYPE.BOUNTY) BIReport:postPayUIShow(BIReport.GIFT_TYPE.BOUNTY, nil, BIReport.PAY_UI_SHOW_TYPE.CLICK_SHOW)
end end
function BountyMainUI:initTitle() function BountyMainUI:initTitle()

1
lua/app/ui/collection/cell/collection_hero_cell.lua
View File

@ -14,6 +14,7 @@ function CollectionHeroCell:init()
self.btnCollect:addClickListener(function() self.btnCollect:addClickListener(function()
if DataManager.CollectionData:getCanCollectPoint(GConst.CollectionConst.TYPE.HERO, self.heroData.id) > 0 then if DataManager.CollectionData:getCanCollectPoint(GConst.CollectionConst.TYPE.HERO, self.heroData.id) > 0 then
AudioManager:playEffect(AudioManager.EFFECT_ID.STAR_GET)
ModuleManager.CollectionManager:reqHeroPoint(self.heroData.id) ModuleManager.CollectionManager:reqHeroPoint(self.heroData.id)
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.COLLECTION_CLICK_GET_POINT, self.imgIcon:getPosition()) EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.COLLECTION_CLICK_GET_POINT, self.imgIcon:getPosition())
else else

9
lua/app/ui/common/cell/player_head_cell.lua
View File

@ -16,12 +16,9 @@ function PlayerHeadCell:refresh(avatarId, frameId, showRp)
end end
-- 背景颜色 -- 背景颜色
local heroId = DataManager.PlayerData:getAvatarHeroId(avatarId) local smallFrame = DataManager.PlayerData:getAvatarBg(avatarId)
if heroId then if smallFrame then
local smallFrame = ModuleManager.HeroManager:getHeroSmallFrame(heroId) self.baseObject:setSprite(GConst.ATLAS_PATH.ICON_HERO, smallFrame)
if smallFrame then
self.baseObject:setSprite(GConst.ATLAS_PATH.ICON_HERO, smallFrame)
end
end end
-- 头像 -- 头像

7
lua/app/ui/dungeon/cell/dungeon_target_cell.lua
View File

@ -12,13 +12,6 @@ function DungeonTargetCell:init()
self.powerObj = uiMap["dungeon_target_cell.right.power"] self.powerObj = uiMap["dungeon_target_cell.right.power"]
self.imgPowerIcon = uiMap["dungeon_target_cell.right.power.img_icon"] self.imgPowerIcon = uiMap["dungeon_target_cell.right.power.img_icon"]
self.txPowerNum = uiMap["dungeon_target_cell.right.power.tx_num"] self.txPowerNum = uiMap["dungeon_target_cell.right.power.tx_num"]
self:bind(DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON), "isDirty", function()
self:refresh()
end)
self:bind(DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR), "isDirty", function()
self:refresh()
end)
end end
function DungeonTargetCell:refresh(target, getWay, id) function DungeonTargetCell:refresh(target, getWay, id)

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