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

Merge branch 'master' into dev_20230919

Browse Source
This commit is contained in:
xiekaidong 2023-08-29 19:41:23 +08:00
commit 3e562738a0
157 changed files with 8672 additions and 3253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ BIReport.ITEM_GET_TYPE = {
ARENA_REMATCH_CD = "ArenaRematchCd",
ARENA_REWARD = "ArenaReward",
ARENA_AD_BOX_REWARD = "ArenaAdBoxReward",
ARENA_SETTLEMENT = "ArenaSettlement",
ARENA_GRADING_REWARD = "ArenaGradingReward",
CHANGE_NAME = "ChangeName", -- 重命名
CHANGE_AVATAR = "ChangeAvatar", -- 修改头像
CHANGE_FRAME = "ChangeFrame", -- 修改头像框
@ -139,6 +139,7 @@ BIReport.ITEM_GET_TYPE = {
ARMOR_UPGRADE = "ArmorUpgrade",
OFFLINE_RECOVERY = "OfflineRecovery",
ACT_SUMMER = "ActSummer",
ACT_HERO_FUND = "ActHeroFund",
}
BIReport.ADS_CLICK_TYPE = {
@ -207,6 +208,7 @@ BIReport.GIFT_TYPE = {
WEAPON_GIFT = "WeaponGift",
ARMOR_GIFT = "ArmorGift",
ACT_SUMMER = "ActSummer",
ACT_HERO_FUND = "ActHeroFund"
}
BIReport.COIN_TYPE = {

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

@ -33,6 +33,7 @@ function DataManager:init()
self:initManager("ShopData", "app/userdata/shop/shop_data")
self:initManager("SummonData", "app/userdata/summon/summon_data")
self:initManager("AIHelperData", "app/userdata/game_setting/ai_helper_data")
self:initManager("HeroFundData", "app/userdata/activity/hero_fund/hero_fund_data")
end
function DataManager:initManager(name, path)
@ -86,6 +87,7 @@ function DataManager:checkDataBind()
end
function DataManager:clear()
self.loginSuccess = false
self.initWithServer = false
if self.cacheTimer then
SchedulerManager:unscheduleGlobal(self.cacheTimer)
@ -117,6 +119,7 @@ function DataManager:clear()
-- 任务数据最后清理
self.TaskData:clear()
self.AIHelperData:clear()
self.HeroFundData:clear()
ModuleManager.TaskManager:clear()
self:clearTryOpenFunc()
end
@ -140,6 +143,7 @@ function DataManager:initWithServerData(data)
self.DungeonData:initDungeonGold(data.chapter_gold_challenge)
self.DungeonData:initDungeonShards(data.chapter_shards_challenge)
self.EquipData:init(data.heroes_equips)
self.EquipData:initGifts(data.act_weapon_armor_gift)
self.SkinData:init(data.bag.skins)
-- HeroData要在EquipData和SkinData之后初始化，依赖它们的属性数据
self.HeroData:init(data.bag.heroes)
@ -176,6 +180,7 @@ function DataManager:initWithServerData(data)
if data.fund then
self.GrowthFundData:init(data.fund.funds)
end
self.HeroFundData:init(data.hero_fund)
-- 任务数据最后初始化,依赖其他模块的数据
self.TaskData:init()
@ -204,6 +209,10 @@ function DataManager:getIsInCreate24Hour()
return passTime < 86400
end
function DataManager:getRegisterTs()
return self.registerTs or 0
end
function DataManager:getIsTodayFirstLogin()
return self.todayFirstLogin or false
end

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

@ -60,6 +60,7 @@ EventManager.CUSTOM_EVENT = {
-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"
DUNGEON_ARMOR_TO_TARGET_ID = "DUNGEON_ARMOR_TO_TARGET_ID",
ACTIVITY_SUMMER_END = "ACTIVITY_SUMMER_END",
MAIN_UI_CHECK_SIDE_BAR = "MAIN_UI_CHECK_SIDE_BAR",
FORMATION_CHANGE = "FORMATION_CHANGE",
}

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

@ -69,6 +69,8 @@ local MODULE_PATHS = {
EquipManager = "app/module/equip/equip_manager",
-- 皮肤
SkinManager = "app/module/skin/skin_manager",
-- 英雄基金
HeroFundManager = "app/module/activity/hero_fund/hero_fund_manager",
}
-- 这里的key对应func_open里的id

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

@ -23,6 +23,9 @@ PayManager.PURCHARSE_ACT_TYPE = {
WEAPON_GIFT = 11,
ARMOR_GIFT = 12,
ACT_SUMMER = 13,
ACT_HERO_FUND = 14,
WEAPON_UPGRADE_GIFT = 15,
ARMOR_UPGRADE_GIFT = 16,
}
PayManager.PURCHARSE_TYPE_CONFIG = {
@ -48,6 +51,9 @@ PayManager.BI_ITEM_GET_TYPE = {
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.ITEM_GET_TYPE.ACT_SUMMER,
[PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.WEAPON_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.ITEM_GET_TYPE.ARMOR_GIFT,
},
[PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.ITEM_GET_TYPE.GOLD_PIG,
[PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.ITEM_GET_TYPE.MALL_TREASURE,
@ -70,6 +76,9 @@ PayManager.BI_GIFT_TYPE = {
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ACT_SUMMER] = BIReport.GIFT_TYPE.ACT_SUMMER,
[PayManager.PURCHARSE_ACT_TYPE.ACT_HERO_FUND] = BIReport.ITEM_GET_TYPE.ACT_HERO_FUND,
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_UPGRADE_GIFT] = BIReport.GIFT_TYPE.WEAPON_GIFT,
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_UPGRADE_GIFT] = BIReport.GIFT_TYPE.ARMOR_GIFT,
},
[PayManager.PURCHARSE_TYPE.ACT_GOLD_PIG] = BIReport.GIFT_TYPE.GOLD_PIG,
[PayManager.PURCHARSE_TYPE.MALL_TREASURE] = BIReport.GIFT_TYPE.MALL_TREASURE,

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

@ -429,8 +429,8 @@ local act_gift = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=5,
["id_for_nothing"]="Uw==",
["id"]=53001,
["id_for_nothing"]="UwtcA2Q=",
["num"]=20,
["num_for_nothing"]="VAg="
},
@ -1675,9 +1675,875 @@ local act_gift = {
},
["limit"]=1,
["value"]=1100
},
[140403]={
["type"]=14,
["recharge_id"]=10,
["limit"]=1
},
[140404]={
["type"]=14,
["recharge_id"]=12,
["limit"]=1
},
[150102]={
["type"]=15,
["parameter_pro"]={
0,
20
},
["recharge_id"]=5,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6000,
["num_for_nothing"]="UAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1001,
["id_for_nothing"]="VwhcAg==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=5,
["num_for_nothing"]="Uw=="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150202]={
["type"]=15,
["parameter_pro"]={
20,
40
},
["recharge_id"]=7,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=6000,
["num_for_nothing"]="UAhcAw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1001,
["id_for_nothing"]="VwhcAg==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=40,
["num_for_nothing"]="Ugg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150302]={
["type"]=15,
["parameter_pro"]={
40,
60
},
["recharge_id"]=8,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=10000,
["num_for_nothing"]="VwhcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=40,
["num_for_nothing"]="Ugg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150402]={
["type"]=15,
["parameter_pro"]={
60,
80
},
["recharge_id"]=8,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=10000,
["num_for_nothing"]="VwhcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=40,
["num_for_nothing"]="Ugg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150502]={
["type"]=15,
["parameter_pro"]={
80,
100
},
["recharge_id"]=12,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=16000,
["num_for_nothing"]="Vw5cA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150602]={
["type"]=15,
["parameter_pro"]={
100,
120
},
["recharge_id"]=12,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=16000,
["num_for_nothing"]="Vw5cA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1002,
["id_for_nothing"]="VwhcAQ==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150702]={
["type"]=15,
["parameter_pro"]={
120,
140
},
["recharge_id"]=13,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=24000,
["num_for_nothing"]="VAxcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1005,
["id_for_nothing"]="VwhcBg==",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150802]={
["type"]=15,
["parameter_pro"]={
140,
160
},
["recharge_id"]=13,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=24000,
["num_for_nothing"]="VAxcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1003,
["id_for_nothing"]="VwhcAA==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1005,
["id_for_nothing"]="VwhcBg==",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[150902]={
["type"]=15,
["parameter_pro"]={
160,
180
},
["recharge_id"]=15,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=40000,
["num_for_nothing"]="UghcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1005,
["id_for_nothing"]="VwhcBg==",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1006,
["id_for_nothing"]="VwhcBQ==",
["num"]=80,
["num_for_nothing"]="Xgg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[151002]={
["type"]=15,
["parameter_pro"]={
180,
200
},
["recharge_id"]=15,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=40000,
["num_for_nothing"]="UghcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1004,
["id_for_nothing"]="VwhcBw==",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1005,
["id_for_nothing"]="VwhcBg==",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1006,
["id_for_nothing"]="VwhcBQ==",
["num"]=80,
["num_for_nothing"]="Xgg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160102]={
["type"]=16,
["parameter_pro"]={
0,
20
},
["recharge_id"]=7,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=12000,
["num_for_nothing"]="VwpcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=38,
["id_for_nothing"]="VQA=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=5,
["num_for_nothing"]="Uw=="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160202]={
["type"]=16,
["parameter_pro"]={
20,
40
},
["recharge_id"]=10,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=12000,
["num_for_nothing"]="VwpcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=38,
["id_for_nothing"]="VQA=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=40,
["num_for_nothing"]="Ugg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160302]={
["type"]=16,
["parameter_pro"]={
40,
60
},
["recharge_id"]=12,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=20000,
["num_for_nothing"]="VAhcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=40,
["num_for_nothing"]="Ugg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160402]={
["type"]=16,
["parameter_pro"]={
60,
80
},
["recharge_id"]=12,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=20000,
["num_for_nothing"]="VAhcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=40,
["num_for_nothing"]="Ugg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160502]={
["type"]=16,
["parameter_pro"]={
80,
100
},
["recharge_id"]=14,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=32000,
["num_for_nothing"]="VQpcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160602]={
["type"]=16,
["parameter_pro"]={
100,
120
},
["recharge_id"]=14,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=32000,
["num_for_nothing"]="VQpcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=39,
["id_for_nothing"]="VQE=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160702]={
["type"]=16,
["parameter_pro"]={
120,
140
},
["recharge_id"]=15,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=48000,
["num_for_nothing"]="UgBcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=42,
["id_for_nothing"]="Ugo=",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160802]={
["type"]=16,
["parameter_pro"]={
140,
160
},
["recharge_id"]=15,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=48000,
["num_for_nothing"]="UgBcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=40,
["id_for_nothing"]="Ugg=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=60,
["num_for_nothing"]="UAg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=42,
["id_for_nothing"]="Ugo=",
["num"]=60,
["num_for_nothing"]="UAg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[160902]={
["type"]=16,
["parameter_pro"]={
160,
180
},
["recharge_id"]=17,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=80000,
["num_for_nothing"]="XghcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=42,
["id_for_nothing"]="Ugo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=43,
["id_for_nothing"]="Ugs=",
["num"]=80,
["num_for_nothing"]="Xgg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
},
[161002]={
["type"]=16,
["parameter_pro"]={
180,
200
},
["recharge_id"]=17,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=80000,
["num_for_nothing"]="XghcA2U="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=41,
["id_for_nothing"]="Ugk=",
["num"]=40,
["num_for_nothing"]="Ugg="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=42,
["id_for_nothing"]="Ugo=",
["num"]=100,
["num_for_nothing"]="Vwhc"
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=43,
["id_for_nothing"]="Ugs=",
["num"]=80,
["num_for_nothing"]="Xgg="
}
},
["time_type"]=1,
["limit_time"]=6,
["cd"]=1,
["value"]=800
}
}
local config = {
data=act_gift,count=54
data=act_gift,count=76
}
return config

627
lua/app/config/activity_herofund.lua Normal file
View File

@ -0,0 +1,627 @@
local activity_herofund = {
[1]={
["exp"]=0,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
[2]={
["exp"]=30,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[3]={
["exp"]=60,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
[4]={
["exp"]=90,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=2,
["num_for_nothing"]="VA=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=13,
["id_for_nothing"]="Vws=",
["num"]=2,
["num_for_nothing"]="VA=="
}
},
[5]={
["exp"]=120,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[6]={
["exp"]=150,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=2,
["num_for_nothing"]="VA=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
[7]={
["exp"]=180,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
[8]={
["exp"]=210,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[9]={
["exp"]=240,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
[10]={
["exp"]=270,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=11,
["id_for_nothing"]="Vwk=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=2,
["num_for_nothing"]="VA=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
[11]={
["exp"]=300,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
[12]={
["exp"]=330,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
},
[13]={
["exp"]=360,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[14]={
["exp"]=390,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
[15]={
["exp"]=420,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=2,
["num_for_nothing"]="VA=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
[16]={
["exp"]=450,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[17]={
["exp"]=480,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
[18]={
["exp"]=510,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=30,
["num_for_nothing"]="VQg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
},
[19]={
["exp"]=540,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=11,
["id_for_nothing"]="Vwk=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=2,
["num_for_nothing"]="VA=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
[20]={
["exp"]=570,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[21]={
["exp"]=600,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=10,
["num_for_nothing"]="Vwg="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=15,
["num_for_nothing"]="Vw0="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=3,
["id_for_nothing"]="VQ==",
["num"]=20,
["num_for_nothing"]="VAg="
}
},
[22]={
["exp"]=630,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
},
[23]={
["exp"]=660,
["reward"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=1,
["num_for_nothing"]="Vw=="
},
["reward_pro"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=2,
["num_for_nothing"]="VA=="
},
["reward_pro_max"]={
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44003,
["id_for_nothing"]="UgxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
}
}
local config = {
data=activity_herofund,count=23
}
return config

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

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

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

@ -20227,7 +20227,7 @@ local arena_board = {
},
{
35,
35
0
},
{
35,

600
lua/app/config/arena_gift.lua Normal file
View File

@ -0,0 +1,600 @@
local arena_gift = {
[1]={
["score"]=900,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=8,
["id_for_nothing"]="Xg==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[2]={
["score"]=950,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=23002,
["id_for_nothing"]="VAtcA2c=",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
[3]={
["score"]=1000,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[4]={
["score"]=1050,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=5000,
["num_for_nothing"]="UwhcAw=="
}
}
},
[5]={
["score"]=1100,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=50,
["num_for_nothing"]="Uwg="
}
},
["unlock_hero"]={
54003
}
},
[6]={
["score"]=1150,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=10,
["id_for_nothing"]="Vwg=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[7]={
["score"]=1200,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=6,
["id_for_nothing"]="UA==",
["num"]=1,
["num_for_nothing"]="Vw=="
}
},
["unlock_hero"]={
34003
}
},
[8]={
["score"]=1250,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=10000,
["num_for_nothing"]="VwhcA2U="
}
}
},
[9]={
["score"]=1300,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=11,
["id_for_nothing"]="Vwk=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[10]={
["score"]=1350,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=60,
["num_for_nothing"]="UAg="
}
}
},
[11]={
["score"]=1400,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=54003,
["id_for_nothing"]="UwxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
},
["unlock_hero"]={
24003
}
},
[12]={
["score"]=1450,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=15000,
["num_for_nothing"]="Vw1cA2U="
}
}
},
[13]={
["score"]=1500,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=11,
["id_for_nothing"]="Vwk=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[14]={
["score"]=1550,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=80,
["num_for_nothing"]="Xgg="
}
}
},
[15]={
["score"]=1600,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=34003,
["id_for_nothing"]="VQxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
}
},
[16]={
["score"]=1650,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=18000,
["num_for_nothing"]="VwBcA2U="
}
}
},
[17]={
["score"]=1700,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=18,
["id_for_nothing"]="VwA=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[18]={
["score"]=1750,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=100,
["num_for_nothing"]="Vwhc"
}
}
},
[19]={
["score"]=1800,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=24003,
["id_for_nothing"]="VAxcA2Y=",
["num"]=3,
["num_for_nothing"]="VQ=="
}
}
},
[20]={
["score"]=1850,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=20000,
["num_for_nothing"]="VAhcA2U="
}
}
},
[21]={
["score"]=1900,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=18,
["id_for_nothing"]="VwA=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[22]={
["score"]=1950,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=120,
["num_for_nothing"]="Vwpc"
}
}
},
[23]={
["score"]=2000,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=5,
["num_for_nothing"]="Uw=="
}
}
},
[24]={
["score"]=2050,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=24000,
["num_for_nothing"]="VAxcA2U="
}
}
},
[25]={
["score"]=2100,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=18,
["id_for_nothing"]="VwA=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[26]={
["score"]=2150,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=150,
["num_for_nothing"]="Vw1c"
}
}
},
[27]={
["score"]=2200,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=8,
["num_for_nothing"]="Xg=="
}
}
},
[28]={
["score"]=2250,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=30000,
["num_for_nothing"]="VQhcA2U="
}
}
},
[29]={
["score"]=2300,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=18,
["id_for_nothing"]="VwA=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[30]={
["score"]=2350,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=180,
["num_for_nothing"]="VwBc"
}
}
},
[31]={
["score"]=2400,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=30000,
["num_for_nothing"]="VQhcA2U="
}
}
},
[32]={
["score"]=2450,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=14,
["id_for_nothing"]="Vww=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[33]={
["score"]=2500,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=10,
["num_for_nothing"]="Vwg="
}
}
},
[34]={
["score"]=2550,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=40000,
["num_for_nothing"]="UghcA2U="
}
}
},
[35]={
["score"]=2600,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=18,
["id_for_nothing"]="VwA=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[36]={
["score"]=2650,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=200,
["num_for_nothing"]="VAhc"
}
}
},
[37]={
["score"]=2700,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=40000,
["num_for_nothing"]="UghcA2U="
}
}
},
[38]={
["score"]=2750,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=15,
["id_for_nothing"]="Vw0=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[39]={
["score"]=2800,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=12,
["num_for_nothing"]="Vwo="
}
}
},
[40]={
["score"]=2850,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=50000,
["num_for_nothing"]="UwhcA2U="
}
}
},
[41]={
["score"]=2900,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=18,
["id_for_nothing"]="VwA=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[42]={
["score"]=2950,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=300,
["num_for_nothing"]="VQhc"
}
}
},
[43]={
["score"]=3000,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=50000,
["num_for_nothing"]="UwhcA2U="
}
}
},
[44]={
["score"]=3050,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=15,
["id_for_nothing"]="Vw0=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
[45]={
["score"]=3100,
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=15,
["num_for_nothing"]="Vw0="
}
}
}
}
local config = {
data=arena_gift,count=45
}
return config

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

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

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

File diff suppressed because it is too large Load Diff

7
lua/app/config/bounty_time.lua
View File

@ -8,9 +8,14 @@ local bounty_time = {
["season"]=2,
["start_time"]="2023-8-1 00:00:00",
["end_time"]="2023-9-1 00:00:00"
},
[3]={
["season"]=3,
["start_time"]="2023-9-1 00:00:00",
["end_time"]="2023-10-1 00:00:00"
}
}
local config = {
data=bounty_time,count=2
data=bounty_time,count=3
}
return config

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

@ -16459,8 +16459,8 @@ local chapter_board = {
1
},
{
22,
1
0,
0
},
{
0,
@ -16657,8 +16657,8 @@ local chapter_board = {
1
},
{
22,
1
0,
0
},
{
0,
@ -17097,8 +17097,8 @@ local chapter_board = {
2
},
{
0,
0
22,
2
},
{
22,
@ -17125,8 +17125,8 @@ local chapter_board = {
1
},
{
0,
0
22,
2
},
{
22,
@ -17153,8 +17153,8 @@ local chapter_board = {
0
},
{
0,
0
22,
2
},
{
22,
@ -17295,8 +17295,8 @@ local chapter_board = {
2
},
{
0,
0
22,
2
},
{
22,
@ -17323,8 +17323,8 @@ local chapter_board = {
1
},
{
0,
0
22,
2
},
{
22,
@ -17351,8 +17351,8 @@ local chapter_board = {
0
},
{
0,
0
22,
2
},
{
22,
@ -24575,8 +24575,8 @@ local chapter_board = {
0
},
{
1,
0
0,
1
},
{
0,
@ -24591,8 +24591,8 @@ local chapter_board = {
2
},
{
1,
0
0,
1
},
{
1,
@ -24631,8 +24631,8 @@ local chapter_board = {
5
},
{
0,
0
23,
5
},
{
27,
@ -24647,8 +24647,8 @@ local chapter_board = {
3
},
{
0,
0
23,
5
},
{
23,

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

File diff suppressed because it is too large Load Diff

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

@ -58,7 +58,7 @@ local chapter_dungeon_equip = {
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=1,
["item_show"]={
{
["type"]=1,
@ -191,13 +191,13 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1001,
["num"]=1,
["weight"]=80
["weight"]=90
},
{
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=20
["weight"]=10
}
},
["rand_drop_num"]=10,
@ -205,12 +205,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1001,
["id"]=1002,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=1,
["item_show"]={
{
["type"]=1,
@ -278,13 +278,13 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1001,
["num"]=1,
["weight"]=60
["weight"]=85
},
{
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=40
["weight"]=15
}
},
["rand_drop_num"]=10,
@ -365,13 +365,13 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1001,
["num"]=1,
["weight"]=35
["weight"]=80
},
{
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=65
["weight"]=20
}
},
["rand_drop_num"]=10,
@ -384,7 +384,7 @@ local chapter_dungeon_equip = {
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=3,
["item_show"]={
{
["type"]=1,
@ -452,19 +452,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1001,
["num"]=1,
["weight"]=15
["weight"]=60
},
{
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=70
["weight"]=30
},
{
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=15
["weight"]=10
}
},
["rand_drop_num"]=10,
@ -472,12 +472,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1002,
["id"]=1003,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=1,
["item_show"]={
{
["type"]=1,
@ -545,19 +545,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1001,
["num"]=1,
["weight"]=5
["weight"]=45
},
{
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=65
["weight"]=40
},
{
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=30
["weight"]=15
}
},
["rand_drop_num"]=10,
@ -565,7 +565,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1002,
["id"]=1003,
["num"]=1,
["weight"]=100
}
@ -634,17 +634,23 @@ local chapter_dungeon_equip = {
}
},
["rand_drop"]={
{
["type"]=1,
["id"]=1001,
["num"]=1,
["weight"]=30
},
{
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=40
["weight"]=50
},
{
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=60
["weight"]=20
}
},
["rand_drop_num"]=10,
@ -657,7 +663,7 @@ local chapter_dungeon_equip = {
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=3,
["item_show"]={
{
["type"]=1,
@ -725,13 +731,13 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=20
["weight"]=60
},
{
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=70
["weight"]=30
},
{
["type"]=1,
@ -745,12 +751,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1003,
["id"]=1004,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=1,
["item_show"]={
{
["type"]=1,
@ -818,19 +824,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=10
["weight"]=45
},
{
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=65
["weight"]=40
},
{
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=25
["weight"]=15
}
},
["rand_drop_num"]=10,
@ -838,7 +844,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1003,
["id"]=1004,
["num"]=1,
["weight"]=100
}
@ -907,17 +913,23 @@ local chapter_dungeon_equip = {
}
},
["rand_drop"]={
{
["type"]=1,
["id"]=1002,
["num"]=1,
["weight"]=30
},
{
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=55
["weight"]=50
},
{
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=45
["weight"]=20
}
},
["rand_drop_num"]=10,
@ -925,12 +937,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1003,
["id"]=1004,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=3,
["item_show"]={
{
["type"]=1,
@ -998,19 +1010,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=30
["weight"]=67
},
{
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=60
["weight"]=25
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=10
["weight"]=8
}
},
["rand_drop_num"]=10,
@ -1018,12 +1030,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1004,
["id"]=1005,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=1,
["item_show"]={
{
["type"]=1,
@ -1091,19 +1103,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=10
["weight"]=57
},
{
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=80
["weight"]=30
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=20
["weight"]=13
}
},
["rand_drop_num"]=10,
@ -1111,7 +1123,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1004,
["id"]=1005,
["num"]=1,
["weight"]=100
}
@ -1180,17 +1192,23 @@ local chapter_dungeon_equip = {
}
},
["rand_drop"]={
{
["type"]=1,
["id"]=1003,
["num"]=1,
["weight"]=46
},
{
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=60
["weight"]=36
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=40
["weight"]=18
}
},
["rand_drop_num"]=10,
@ -1198,12 +1216,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1004,
["id"]=1005,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=3,
["item_show"]={
{
["type"]=1,
@ -1271,19 +1289,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=30
["weight"]=66
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=55
["weight"]=30
},
{
["type"]=1,
["id"]=1006,
["num"]=1,
["weight"]=5
["weight"]=4
}
},
["rand_drop_num"]=10,
@ -1291,12 +1309,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1004,
["id"]=1006,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=1,
["item_show"]={
{
["type"]=1,
@ -1372,19 +1390,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=20
["weight"]=53
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=70
["weight"]=38
},
{
["type"]=1,
["id"]=1006,
["num"]=1,
["weight"]=10
["weight"]=9
}
},
["rand_drop_num"]=10,
@ -1392,12 +1410,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1005,
["id"]=1006,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=1,
["item_show"]={
{
["type"]=1,
@ -1465,19 +1483,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=15
["weight"]=43
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=65
["weight"]=42
},
{
["type"]=1,
["id"]=1006,
["num"]=1,
["weight"]=20
["weight"]=15
}
},
["rand_drop_num"]=10,
@ -1485,7 +1503,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1005,
["id"]=1006,
["num"]=1,
["weight"]=100
}
@ -1558,19 +1576,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=10
["weight"]=40
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=60
["weight"]=40
},
{
["type"]=1,
["id"]=1006,
["num"]=1,
["weight"]=30
["weight"]=20
}
},
["rand_drop_num"]=10,
@ -1578,7 +1596,7 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1005,
["id"]=1006,
["num"]=1,
["weight"]=100
}
@ -1651,19 +1669,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=7
["weight"]=37
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=53
["weight"]=38
},
{
["type"]=1,
["id"]=1006,
["num"]=1,
["weight"]=40
["weight"]=25
}
},
["rand_drop_num"]=10,
@ -1671,12 +1689,12 @@ local chapter_dungeon_equip = {
["bao_drop"]={
{
["type"]=1,
["id"]=1005,
["id"]=1006,
["num"]=1,
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=3,
["item_show"]={
{
["type"]=1,
@ -1744,19 +1762,19 @@ local chapter_dungeon_equip = {
["type"]=1,
["id"]=1004,
["num"]=1,
["weight"]=5
["weight"]=34
},
{
["type"]=1,
["id"]=1005,
["num"]=1,
["weight"]=45
["weight"]=36
},
{
["type"]=1,
["id"]=1006,
["num"]=1,
["weight"]=50
["weight"]=30
}
},
["rand_drop_num"]=10,
@ -1769,7 +1787,7 @@ local chapter_dungeon_equip = {
["weight"]=100
}
},
["bao_drop_num"]=2,
["bao_drop_num"]=3,
["item_show"]={
{
["type"]=1,

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

@ -373,9 +373,12 @@ local const = {
["num"]=50,
["num_for_nothing"]="Uwg="
}
},
["bounty_click"]={
["value"]=4
}
}
local config = {
data=const,count=76
data=const,count=77
}
return config

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

@ -7556,12 +7556,12 @@ local equip = {
}
},
["weapon_icon"]={
31,
32,
33,
34,
35,
36
25,
26,
27,
28,
29,
30
}
},
[1400103]={
@ -8001,12 +8001,12 @@ local equip = {
}
},
["weapon_icon"]={
19,
20,
21,
22,
23,
24
13,
14,
15,
16,
17,
18
}
},
[1400104]={
@ -8446,12 +8446,12 @@ local equip = {
}
},
["weapon_icon"]={
7,
8,
9,
10,
11,
12
1,
2,
3,
4,
5,
6
}
},
[1400105]={
@ -8891,12 +8891,12 @@ local equip = {
}
},
["weapon_icon"]={
43,
44,
45,
46,
47,
48
37,
38,
39,
40,
41,
42
}
},
[1400201]={

11
lua/app/config/fx.lua
View File

@ -2003,6 +2003,10 @@ local fx = {
["bind"]="root",
["bg"]=1
},
[300150]={
["res"]="sfx_p0036_b05",
["bind"]="root"
},
[400000]={
["res"]="sfx_p0012_b01",
["bind"]="root",
@ -2754,9 +2758,14 @@ local fx = {
["bind"]="root",
["flip"]=1,
["bg"]=1
},
[400150]={
["res"]="sfx_p0036_b05",
["bind"]="root",
["flip"]=1
}
}
local config = {
data=fx,count=647
data=fx,count=649
}
return config

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

@ -1,17 +1,17 @@
local grid_edge_type = {
[1]={
["icon"]="battle_obstacle_coral_1",
["break_sfx"]="sfx_piece_za_b01"
["break_sfx"]="sfx_piece_shanhu_b01"
},
[2]={
["icon"]="battle_obstacle_coral_2",
["next_type"]=1,
["break_sfx"]="sfx_piece_za_b01"
["break_sfx"]="sfx_piece_shanhu_b01"
},
[3]={
["icon"]="battle_obstacle_coral_3",
["next_type"]=2,
["break_sfx"]="sfx_piece_za_b01"
["break_sfx"]="sfx_piece_shanhu_b01"
}
}
local config = {

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

@ -247,7 +247,8 @@ local hero = {
["is_show"]=1,
["collection_point"]=5,
["skin"]={
14001
14001,
1400101
}
},
[14002]={

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

@ -1562,7 +1562,8 @@ local item = {
4,
5,
6,
7
7,
8
}
},
[1002]={
@ -1571,14 +1572,14 @@ local item = {
["icon"]="1002",
["get_way_type"]=1,
["get_way"]={
6,
7,
5,
8,
4,
9,
3,
10
8,
10,
6,
11,
5,
4,
3
}
},
[1003]={
@ -1587,14 +1588,15 @@ local item = {
["icon"]="1003",
["get_way_type"]=1,
["get_way"]={
9,
10,
8,
11,
12,
13,
11,
14,
10,
9,
8,
7,
6,
13
6
}
},
[1004]={
@ -1603,18 +1605,18 @@ local item = {
["icon"]="1004",
["get_way_type"]=1,
["get_way"]={
13,
14,
12,
15,
11,
16,
10,
17,
18,
19,
14,
20,
10
13,
12,
11,
10,
9
}
},
[1005]={
@ -1623,12 +1625,12 @@ local item = {
["icon"]="1005",
["get_way_type"]=1,
["get_way"]={
16,
17,
18,
16,
19,
15,
20,
15,
14,
13,
12
@ -1674,21 +1676,21 @@ local item = {
["icon"]="1008",
["get_way_type"]=2,
["get_way"]={
25,
31,
19,
13,
25,
7,
31,
29,
30,
35,
36,
23,
24,
17,
18,
29,
30,
11,
12,
35,
36
12
}
},
[1009]={
@ -1697,22 +1699,22 @@ local item = {
["icon"]="1009",
["get_way_type"]=2,
["get_way"]={
31,
37,
43,
31,
25,
19,
43,
13,
35,
36,
41,
42,
47,
48,
35,
36,
29,
30,
23,
24,
47,
48,
17,
18
}
@ -1723,22 +1725,22 @@ local item = {
["icon"]="1010",
["get_way_type"]=2,
["get_way"]={
43,
49,
55,
43,
37,
31,
55,
25,
47,
48,
53,
54,
59,
60,
47,
48,
41,
42,
35,
36,
59,
60,
29,
30
}
@ -1772,7 +1774,7 @@ local item = {
55,
49,
59,
60,
54,
53,
54
}
@ -1803,21 +1805,21 @@ local item = {
["icon"]="1020",
["get_way_type"]=2,
["get_way"]={
26,
32,
20,
14,
26,
8,
32,
29,
30,
35,
36,
23,
24,
17,
18,
29,
30,
11,
12,
35,
36
12
}
},
[1015]={
@ -1826,22 +1828,22 @@ local item = {
["icon"]="1021",
["get_way_type"]=2,
["get_way"]={
32,
38,
44,
32,
26,
20,
44,
14,
35,
36,
41,
42,
47,
48,
35,
36,
29,
30,
23,
24,
47,
48,
17,
18
}
@ -1852,22 +1854,22 @@ local item = {
["icon"]="1022",
["get_way_type"]=2,
["get_way"]={
44,
50,
56,
44,
38,
32,
56,
26,
47,
48,
53,
54,
59,
60,
47,
48,
41,
42,
35,
36,
59,
60,
29,
30
}
@ -1901,7 +1903,7 @@ local item = {
56,
50,
59,
60,
54,
53,
54
}
@ -1932,21 +1934,21 @@ local item = {
["icon"]="1014",
["get_way_type"]=2,
["get_way"]={
27,
33,
21,
15,
27,
9,
33,
29,
30,
35,
36,
23,
24,
17,
18,
29,
30,
11,
12,
35,
36
12
}
},
[1021]={
@ -1955,22 +1957,22 @@ local item = {
["icon"]="1015",
["get_way_type"]=2,
["get_way"]={
33,
39,
45,
33,
27,
21,
45,
15,
35,
36,
41,
42,
47,
48,
35,
36,
29,
30,
23,
24,
47,
48,
17,
18
}
@ -1981,22 +1983,22 @@ local item = {
["icon"]="1016",
["get_way_type"]=2,
["get_way"]={
45,
51,
57,
45,
39,
33,
57,
27,
47,
48,
53,
54,
59,
60,
47,
48,
41,
42,
35,
36,
59,
60,
29,
30
}
@ -2030,7 +2032,7 @@ local item = {
57,
51,
59,
60,
54,
53,
54
}
@ -2061,21 +2063,21 @@ local item = {
["icon"]="1026",
["get_way_type"]=2,
["get_way"]={
28,
34,
22,
16,
28,
10,
34,
29,
30,
35,
36,
23,
24,
17,
18,
29,
30,
11,
12,
35,
36
12
}
},
[1027]={
@ -2084,22 +2086,22 @@ local item = {
["icon"]="1027",
["get_way_type"]=2,
["get_way"]={
34,
40,
46,
34,
28,
22,
46,
16,
35,
36,
41,
42,
47,
48,
35,
36,
29,
30,
23,
24,
47,
48,
17,
18
}
@ -2110,22 +2112,22 @@ local item = {
["icon"]="1028",
["get_way_type"]=2,
["get_way"]={
46,
52,
58,
46,
40,
34,
58,
28,
47,
48,
53,
54,
59,
60,
47,
48,
41,
42,
35,
36,
59,
60,
29,
30
}
@ -2159,7 +2161,7 @@ local item = {
58,
52,
59,
60,
54,
53,
54
}
@ -2367,9 +2369,15 @@ local item = {
["parameter"]=5400101,
["qlt"]=4,
["icon"]="5400101"
},
[1400101]={
["type"]=12,
["parameter"]=1400101,
["qlt"]=3,
["icon"]="1400101"
}
}
local config = {
data=item,count=111
data=item,count=112
}
return config

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

@ -448,6 +448,24 @@ local LocalizationGlobalConst =
ACT_DESC_12 = "ACT_DESC_12",
ARENA_DESC_35 = "ARENA_DESC_35",
ARENA_DESC_36 = "ARENA_DESC_36",
ONE_KEY_GET_DESC = "ONE_KEY_GET_DESC",
ACTIVITY_OVER_EDSC = "ACTIVITY_OVER_EDSC",
PART_IN_DESC = "PART_IN_DESC",
HERO_FUND_DESCC_1 = "HERO_FUND_DESCC_1",
HERO_FUND_DESCC_2 = "HERO_FUND_DESCC_2",
HERO_FUND_DESCC_3 = "HERO_FUND_DESCC_3",
HERO_FUND_DESCC_4 = "HERO_FUND_DESCC_4",
ARENA_DESC_37 = "ARENA_DESC_37",
ARENA_DESC_38 = "ARENA_DESC_38",
ARENA_DESC_39 = "ARENA_DESC_39",
ARENA_DESC_40 = "ARENA_DESC_40",
ARENA_DESC_41 = "ARENA_DESC_41",
ARENA_DESC_42 = "ARENA_DESC_42",
EQUIP_DESC_26 = "EQUIP_DESC_26",
EQUIP_DESC_27 = "EQUIP_DESC_27",
SEIZED_DESC_1 = "SEIZED_DESC_1",
SEIZED_DESC_2 = "SEIZED_DESC_2",
SEIZED_DESC_3 = "SEIZED_DESC_3",
}
return LocalizationGlobalConst

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

File diff suppressed because it is too large Load Diff

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

@ -1,7 +1,7 @@
local monster_dungeon_equip = {
[106]={
["monster_base"]=10056,
["hp"]=76930000,
["hp"]=81620000,
["atk"]=1390000,
["atk_times"]=3,
["hurt_skill"]={
@ -16,7 +16,7 @@ local monster_dungeon_equip = {
},
[206]={
["monster_base"]=10045,
["hp"]=93400000,
["hp"]=99240000,
["atk"]=1930000,
["atk_times"]=3,
["hurt_skill"]={
@ -31,7 +31,7 @@ local monster_dungeon_equip = {
},
[306]={
["monster_base"]=10028,
["hp"]=153020000,
["hp"]=178640000,
["atk"]=2140000,
["atk_times"]=3,
["hurt_skill"]={
@ -46,7 +46,7 @@ local monster_dungeon_equip = {
},
[406]={
["monster_base"]=10003,
["hp"]=203320000,
["hp"]=237440000,
["atk"]=2220000,
["atk_times"]=2,
["hurt_skill"]={
@ -62,7 +62,7 @@ local monster_dungeon_equip = {
[506]={
["monster_base"]=20041,
["is_boss"]=2,
["hp"]=386900000,
["hp"]=431900000,
["atk"]=2260000,
["atk_times"]=4,
["hurt_skill"]={
@ -82,7 +82,7 @@ local monster_dungeon_equip = {
},
[606]={
["monster_base"]=10060,
["hp"]=85320000,
["hp"]=90860000,
["atk"]=1540000,
["atk_times"]=3,
["hurt_skill"]={
@ -97,7 +97,7 @@ local monster_dungeon_equip = {
},
[706]={
["monster_base"]=10055,
["hp"]=103120000,
["hp"]=110400000,
["atk"]=2150000,
["atk_times"]=3,
["hurt_skill"]={
@ -112,7 +112,7 @@ local monster_dungeon_equip = {
},
[806]={
["monster_base"]=10027,
["hp"]=168890000,
["hp"]=198820000,
["atk"]=2380000,
["atk_times"]=3,
["hurt_skill"]={
@ -127,7 +127,7 @@ local monster_dungeon_equip = {
},
[906]={
["monster_base"]=10064,
["hp"]=224600000,
["hp"]=264180000,
["atk"]=2470000,
["atk_times"]=3,
["hurt_skill"]={
@ -143,7 +143,7 @@ local monster_dungeon_equip = {
[1006]={
["monster_base"]=20040,
["is_boss"]=2,
["hp"]=426150000,
["hp"]=480480000,
["atk"]=2520000,
["atk_times"]=4,
["hurt_skill"]={
@ -162,7 +162,7 @@ local monster_dungeon_equip = {
},
[1106]={
["monster_base"]=10015,
["hp"]=93300000,
["hp"]=98780000,
["atk"]=1680000,
["atk_times"]=3,
["hurt_skill"]={
@ -177,7 +177,7 @@ local monster_dungeon_equip = {
},
[1206]={
["monster_base"]=10025,
["hp"]=112820000,
["hp"]=119880000,
["atk"]=2340000,
["atk_times"]=3,
["hurt_skill"]={
@ -192,7 +192,7 @@ local monster_dungeon_equip = {
},
[1306]={
["monster_base"]=10030,
["hp"]=191790000,
["hp"]=215800000,
["atk"]=2590000,
["atk_times"]=3,
["hurt_skill"]={
@ -207,7 +207,7 @@ local monster_dungeon_equip = {
},
[1406]={
["monster_base"]=10018,
["hp"]=255070000,
["hp"]=286720000,
["atk"]=2690000,
["atk_times"]=3,
["hurt_skill"]={
@ -223,7 +223,7 @@ local monster_dungeon_equip = {
[1506]={
["monster_base"]=20039,
["is_boss"]=2,
["hp"]=494490000,
["hp"]=521500000,
["atk"]=2740000,
["atk_times"]=4,
["hurt_skill"]={
@ -242,8 +242,8 @@ local monster_dungeon_equip = {
},
[1606]={
["monster_base"]=10004,
["hp"]=119700000,
["atk"]=1830000,
["hp"]=118220000,
["atk"]=2020000,
["atk_times"]=2,
["hurt_skill"]={
20010,
@ -257,8 +257,8 @@ local monster_dungeon_equip = {
},
[1706]={
["monster_base"]=10049,
["hp"]=143630000,
["atk"]=2540000,
["hp"]=143890000,
["atk"]=2820000,
["atk_times"]=3,
["hurt_skill"]={
20142,
@ -272,8 +272,8 @@ local monster_dungeon_equip = {
},
[1806]={
["monster_base"]=10037,
["hp"]=235050000,
["atk"]=2810000,
["hp"]=259680000,
["atk"]=3120000,
["atk_times"]=3,
["hurt_skill"]={
20106,
@ -287,8 +287,8 @@ local monster_dungeon_equip = {
},
[1906]={
["monster_base"]=10016,
["hp"]=312870000,
["atk"]=2920000,
["hp"]=351150000,
["atk"]=3240000,
["atk_times"]=3,
["hurt_skill"]={
20043,
@ -303,8 +303,8 @@ local monster_dungeon_equip = {
[2006]={
["monster_base"]=20043,
["is_boss"]=2,
["hp"]=566760000,
["atk"]=2980000,
["hp"]=638400000,
["atk"]=3310000,
["atk_times"]=4,
["hurt_skill"]={
30120,
@ -323,8 +323,8 @@ local monster_dungeon_equip = {
},
[2106]={
["monster_base"]=10022,
["hp"]=136880000,
["atk"]=2010000,
["hp"]=126040000,
["atk"]=2180000,
["atk_times"]=3,
["hurt_skill"]={
20061,
@ -338,8 +338,8 @@ local monster_dungeon_equip = {
},
[2206]={
["monster_base"]=10032,
["hp"]=163040000,
["atk"]=2780000,
["hp"]=153470000,
["atk"]=3010000,
["atk_times"]=3,
["hurt_skill"]={
20091,
@ -353,8 +353,8 @@ local monster_dungeon_equip = {
},
[2306]={
["monster_base"]=10013,
["hp"]=267170000,
["atk"]=3070000,
["hp"]=276960000,
["atk"]=3330000,
["atk_times"]=3,
["hurt_skill"]={
20034,
@ -368,8 +368,8 @@ local monster_dungeon_equip = {
},
[2406]={
["monster_base"]=10001,
["hp"]=355450000,
["atk"]=3200000,
["hp"]=374550000,
["atk"]=3480000,
["atk_times"]=2,
["hurt_skill"]={
20001,
@ -384,8 +384,8 @@ local monster_dungeon_equip = {
[2506]={
["monster_base"]=20042,
["is_boss"]=2,
["hp"]=643710000,
["atk"]=3260000,
["hp"]=680700000,
["atk"]=3540000,
["atk_times"]=4,
["hurt_skill"]={
30123,
@ -403,8 +403,8 @@ local monster_dungeon_equip = {
},
[2606]={
["monster_base"]=10045,
["hp"]=147550000,
["atk"]=2190000,
["hp"]=140300000,
["atk"]=2400000,
["atk_times"]=3,
["hurt_skill"]={
20130,
@ -418,8 +418,8 @@ local monster_dungeon_equip = {
},
[2706]={
["monster_base"]=10056,
["hp"]=175200000,
["atk"]=3030000,
["hp"]=169470000,
["atk"]=3320000,
["atk_times"]=3,
["hurt_skill"]={
20163,
@ -433,8 +433,8 @@ local monster_dungeon_equip = {
},
[2806]={
["monster_base"]=10003,
["hp"]=287270000,
["atk"]=3340000,
["hp"]=306100000,
["atk"]=3660000,
["atk_times"]=2,
["hurt_skill"]={
20007,
@ -448,8 +448,8 @@ local monster_dungeon_equip = {
},
[2906]={
["monster_base"]=10028,
["hp"]=382140000,
["atk"]=3490000,
["hp"]=415400000,
["atk"]=3830000,
["atk_times"]=3,
["hurt_skill"]={
20079,
@ -464,8 +464,8 @@ local monster_dungeon_equip = {
[3006]={
["monster_base"]=20041,
["is_boss"]=2,
["hp"]=691660000,
["atk"]=3560000,
["hp"]=754750000,
["atk"]=3970000,
["atk_times"]=4,
["hurt_skill"]={
30126,
@ -484,8 +484,8 @@ local monster_dungeon_equip = {
},
[3106]={
["monster_base"]=10052,
["hp"]=161570000,
["atk"]=2380000,
["hp"]=153460000,
["atk"]=2630000,
["atk_times"]=3,
["hurt_skill"]={
20151,
@ -499,8 +499,8 @@ local monster_dungeon_equip = {
},
[3206]={
["monster_base"]=10062,
["hp"]=191650000,
["atk"]=3300000,
["hp"]=185090000,
["atk"]=3630000,
["atk_times"]=3,
["hurt_skill"]={
20181,
@ -514,8 +514,8 @@ local monster_dungeon_equip = {
},
[3306]={
["monster_base"]=10036,
["hp"]=313710000,
["atk"]=3620000,
["hp"]=334280000,
["atk"]=4000000,
["atk_times"]=3,
["hurt_skill"]={
20103,
@ -529,8 +529,8 @@ local monster_dungeon_equip = {
},
[3406]={
["monster_base"]=10061,
["hp"]=417370000,
["atk"]=3790000,
["hp"]=453650000,
["atk"]=4190000,
["atk_times"]=3,
["hurt_skill"]={
20178,
@ -545,8 +545,8 @@ local monster_dungeon_equip = {
[3506]={
["monster_base"]=20040,
["is_boss"]=2,
["hp"]=754850000,
["atk"]=3870000,
["hp"]=824060000,
["atk"]=4350000,
["atk_times"]=4,
["hurt_skill"]={
30129,
@ -564,8 +564,8 @@ local monster_dungeon_equip = {
},
[3606]={
["monster_base"]=10030,
["hp"]=175230000,
["atk"]=2580000,
["hp"]=163330000,
["atk"]=2810000,
["atk_times"]=3,
["hurt_skill"]={
20085,
@ -579,8 +579,8 @@ local monster_dungeon_equip = {
},
[3706]={
["monster_base"]=10015,
["hp"]=207360000,
["atk"]=3560000,
["hp"]=196740000,
["atk"]=3870000,
["atk_times"]=3,
["hurt_skill"]={
20040,
@ -594,8 +594,8 @@ local monster_dungeon_equip = {
},
[3806]={
["monster_base"]=10025,
["hp"]=338580000,
["atk"]=3900000,
["hp"]=355260000,
["atk"]=4250000,
["atk_times"]=3,
["hurt_skill"]={
20070,
@ -609,8 +609,8 @@ local monster_dungeon_equip = {
},
[3906]={
["monster_base"]=10034,
["hp"]=450950000,
["atk"]=4090000,
["hp"]=481950000,
["atk"]=4460000,
["atk_times"]=3,
["hurt_skill"]={
20097,
@ -625,8 +625,8 @@ local monster_dungeon_equip = {
[4006]={
["monster_base"]=20039,
["is_boss"]=2,
["hp"]=814970000,
["atk"]=4170000,
["hp"]=875620000,
["atk"]=4630000,
["atk_times"]=4,
["hurt_skill"]={
30117,
@ -644,8 +644,8 @@ local monster_dungeon_equip = {
},
[4106]={
["monster_base"]=10054,
["hp"]=182360000,
["atk"]=2660000,
["hp"]=177360000,
["atk"]=3070000,
["atk_times"]=3,
["hurt_skill"]={
20157,
@ -659,8 +659,8 @@ local monster_dungeon_equip = {
},
[4206]={
["monster_base"]=10037,
["hp"]=215460000,
["atk"]=3660000,
["hp"]=215560000,
["atk"]=4230000,
["atk_times"]=3,
["hurt_skill"]={
20106,
@ -674,8 +674,8 @@ local monster_dungeon_equip = {
},
[4306]={
["monster_base"]=10012,
["hp"]=351510000,
["atk"]=4010000,
["hp"]=386500000,
["atk"]=4650000,
["atk_times"]=3,
["hurt_skill"]={
20031,
@ -689,8 +689,8 @@ local monster_dungeon_equip = {
},
[4406]={
["monster_base"]=10049,
["hp"]=468340000,
["atk"]=4210000,
["hp"]=521660000,
["atk"]=4870000,
["atk_times"]=3,
["hurt_skill"]={
20142,
@ -705,8 +705,8 @@ local monster_dungeon_equip = {
[4506]={
["monster_base"]=20043,
["is_boss"]=2,
["hp"]=846340000,
["atk"]=4290000,
["hp"]=947700000,
["atk"]=5140000,
["atk_times"]=4,
["hurt_skill"]={
30120,
@ -725,8 +725,8 @@ local monster_dungeon_equip = {
},
[4606]={
["monster_base"]=10042,
["hp"]=187110000,
["atk"]=2740000,
["hp"]=187920000,
["atk"]=3250000,
["atk_times"]=3,
["hurt_skill"]={
20121,
@ -740,8 +740,8 @@ local monster_dungeon_equip = {
},
[4706]={
["monster_base"]=10026,
["hp"]=220970000,
["atk"]=3780000,
["hp"]=228230000,
["atk"]=4480000,
["atk_times"]=3,
["hurt_skill"]={
20073,
@ -755,8 +755,8 @@ local monster_dungeon_equip = {
},
[4806]={
["monster_base"]=10019,
["hp"]=360430000,
["atk"]=4140000,
["hp"]=409000000,
["atk"]=4940000,
["atk_times"]=3,
["hurt_skill"]={
20052,
@ -770,8 +770,8 @@ local monster_dungeon_equip = {
},
[4906]={
["monster_base"]=10001,
["hp"]=480060000,
["atk"]=4340000,
["hp"]=551930000,
["atk"]=5160000,
["atk_times"]=2,
["hurt_skill"]={
20001,
@ -786,8 +786,8 @@ local monster_dungeon_equip = {
[5006]={
["monster_base"]=20042,
["is_boss"]=2,
["hp"]=867510000,
["atk"]=4430000,
["hp"]=1002610000,
["atk"]=5440000,
["atk_times"]=4,
["hurt_skill"]={
30132,
@ -805,8 +805,8 @@ local monster_dungeon_equip = {
},
[5106]={
["monster_base"]=10045,
["hp"]=200880000,
["atk"]=2910000,
["hp"]=199440000,
["atk"]=3450000,
["atk_times"]=3,
["hurt_skill"]={
20130,
@ -820,8 +820,8 @@ local monster_dungeon_equip = {
},
[5206]={
["monster_base"]=10056,
["hp"]=236460000,
["atk"]=4010000,
["hp"]=242090000,
["atk"]=4750000,
["atk_times"]=3,
["hurt_skill"]={
20163,
@ -835,8 +835,8 @@ local monster_dungeon_equip = {
},
[5306]={
["monster_base"]=10003,
["hp"]=385650000,
["atk"]=4400000,
["hp"]=433750000,
["atk"]=5240000,
["atk_times"]=2,
["hurt_skill"]={
20007,
@ -850,8 +850,8 @@ local monster_dungeon_equip = {
},
[5406]={
["monster_base"]=10028,
["hp"]=513230000,
["atk"]=4600000,
["hp"]=585310000,
["atk"]=5480000,
["atk_times"]=3,
["hurt_skill"]={
20079,
@ -866,8 +866,8 @@ local monster_dungeon_equip = {
[5506]={
["monster_base"]=20041,
["is_boss"]=2,
["hp"]=927400000,
["atk"]=4690000,
["hp"]=1063140000,
["atk"]=5780000,
["atk_times"]=4,
["hurt_skill"]={
30126,
@ -886,8 +886,8 @@ local monster_dungeon_equip = {
},
[5606]={
["monster_base"]=10029,
["hp"]=202710000,
["atk"]=2990000,
["hp"]=221510000,
["atk"]=4040000,
["atk_times"]=3,
["hurt_skill"]={
20082,
@ -901,8 +901,8 @@ local monster_dungeon_equip = {
},
[5706]={
["monster_base"]=10055,
["hp"]=238240000,
["atk"]=4130000,
["hp"]=267580000,
["atk"]=5560000,
["atk_times"]=3,
["hurt_skill"]={
20160,
@ -916,8 +916,8 @@ local monster_dungeon_equip = {
},
[5806]={
["monster_base"]=10051,
["hp"]=388530000,
["atk"]=4530000,
["hp"]=484180000,
["atk"]=6110000,
["atk_times"]=3,
["hurt_skill"]={
20148,
@ -931,8 +931,8 @@ local monster_dungeon_equip = {
},
[5906]={
["monster_base"]=10064,
["hp"]=517080000,
["atk"]=4730000,
["hp"]=650420000,
["atk"]=6400000,
["atk_times"]=3,
["hurt_skill"]={
20190,
@ -947,8 +947,8 @@ local monster_dungeon_equip = {
[6006]={
["monster_base"]=20040,
["is_boss"]=2,
["hp"]=933980000,
["atk"]=4820000,
["hp"]=1181290000,
["atk"]=6660000,
["atk_times"]=4,
["hurt_skill"]={
30135,
@ -966,8 +966,8 @@ local monster_dungeon_equip = {
},
[6106]={
["monster_base"]=10015,
["hp"]=216480000,
["atk"]=3180000,
["hp"]=227560000,
["atk"]=4160000,
["atk_times"]=3,
["hurt_skill"]={
20040,
@ -981,8 +981,8 @@ local monster_dungeon_equip = {
},
[6206]={
["monster_base"]=10025,
["hp"]=254320000,
["atk"]=4380000,
["hp"]=274900000,
["atk"]=5710000,
["atk_times"]=3,
["hurt_skill"]={
20070,
@ -996,8 +996,8 @@ local monster_dungeon_equip = {
},
[6306]={
["monster_base"]=10021,
["hp"]=415070000,
["atk"]=4810000,
["hp"]=497380000,
["atk"]=6280000,
["atk_times"]=3,
["hurt_skill"]={
20058,
@ -1011,8 +1011,8 @@ local monster_dungeon_equip = {
},
[6406]={
["monster_base"]=10034,
["hp"]=552120000,
["atk"]=5030000,
["hp"]=668140000,
["atk"]=6580000,
["atk_times"]=3,
["hurt_skill"]={
20097,
@ -1027,8 +1027,8 @@ local monster_dungeon_equip = {
[6506]={
["monster_base"]=20039,
["is_boss"]=2,
["hp"]=996810000,
["atk"]=5130000,
["hp"]=1213440000,
["atk"]=6850000,
["atk_times"]=4,
["hurt_skill"]={
30117,
@ -1046,8 +1046,8 @@ local monster_dungeon_equip = {
},
[6606]={
["monster_base"]=10049,
["hp"]=221080000,
["atk"]=3280000,
["hp"]=151200000,
["atk"]=1050000,
["atk_times"]=3,
["hurt_skill"]={
20142,
@ -1061,8 +1061,8 @@ local monster_dungeon_equip = {
},
[6706]={
["monster_base"]=10006,
["hp"]=259330000,
["atk"]=4500000,
["hp"]=282760000,
["atk"]=5870000,
["atk_times"]=2,
["hurt_skill"]={
20016,
@ -1076,8 +1076,8 @@ local monster_dungeon_equip = {
},
[6806]={
["monster_base"]=10054,
["hp"]=423100000,
["atk"]=4950000,
["hp"]=511630000,
["atk"]=6460000,
["atk_times"]=3,
["hurt_skill"]={
20157,
@ -1091,8 +1091,8 @@ local monster_dungeon_equip = {
},
[6906]={
["monster_base"]=10024,
["hp"]=562720000,
["atk"]=5180000,
["hp"]=687320000,
["atk"]=6770000,
["atk_times"]=3,
["hurt_skill"]={
20067,
@ -1107,8 +1107,8 @@ local monster_dungeon_equip = {
[7006]={
["monster_base"]=20043,
["is_boss"]=2,
["hp"]=1015810000,
["atk"]=5280000,
["hp"]=1248040000,
["atk"]=7050000,
["atk_times"]=4,
["hurt_skill"]={
30120,
@ -1127,8 +1127,8 @@ local monster_dungeon_equip = {
},
[7106]={
["monster_base"]=10019,
["hp"]=225650000,
["atk"]=3370000,
["hp"]=273750000,
["atk"]=4990000,
["atk_times"]=3,
["hurt_skill"]={
20052,
@ -1142,8 +1142,8 @@ local monster_dungeon_equip = {
},
[7206]={
["monster_base"]=10035,
["hp"]=264660000,
["atk"]=4630000,
["hp"]=330170000,
["atk"]=6840000,
["atk_times"]=3,
["hurt_skill"]={
20100,
@ -1157,8 +1157,8 @@ local monster_dungeon_equip = {
},
[7306]={
["monster_base"]=10026,
["hp"]=431730000,
["atk"]=5090000,
["hp"]=624370000,
["atk"]=7530000,
["atk_times"]=3,
["hurt_skill"]={
20073,
@ -1172,8 +1172,8 @@ local monster_dungeon_equip = {
},
[7406]={
["monster_base"]=10041,
["hp"]=574040000,
["atk"]=5330000,
["hp"]=801000000,
["atk"]=7910000,
["atk_times"]=3,
["hurt_skill"]={
20118,
@ -1188,8 +1188,8 @@ local monster_dungeon_equip = {
[7506]={
["monster_base"]=20042,
["is_boss"]=2,
["hp"]=1036280000,
["atk"]=5440000,
["hp"]=1454090000,
["atk"]=8290000,
["atk_times"]=4,
["hurt_skill"]={
30138,
@ -1207,8 +1207,8 @@ local monster_dungeon_equip = {
},
[7606]={
["monster_base"]=10053,
["hp"]=233950000,
["atk"]=3470000,
["hp"]=289120000,
["atk"]=5270000,
["atk_times"]=3,
["hurt_skill"]={
20154,
@ -1222,8 +1222,8 @@ local monster_dungeon_equip = {
},
[7706]={
["monster_base"]=10043,
["hp"]=273880000,
["atk"]=4760000,
["hp"]=348580000,
["atk"]=7220000,
["atk_times"]=3,
["hurt_skill"]={
20124,
@ -1237,8 +1237,8 @@ local monster_dungeon_equip = {
},
[7806]={
["monster_base"]=10033,
["hp"]=446810000,
["atk"]=5230000,
["hp"]=659030000,
["atk"]=7960000,
["atk_times"]=3,
["hurt_skill"]={
20094,
@ -1252,8 +1252,8 @@ local monster_dungeon_equip = {
},
[7906]={
["monster_base"]=10028,
["hp"]=594050000,
["atk"]=5480000,
["hp"]=845550000,
["atk"]=8350000,
["atk_times"]=3,
["hurt_skill"]={
20079,
@ -1268,8 +1268,8 @@ local monster_dungeon_equip = {
[8006]={
["monster_base"]=20041,
["is_boss"]=2,
["hp"]=1072430000,
["atk"]=5590000,
["hp"]=1534760000,
["atk"]=8750000,
["atk_times"]=4,
["hurt_skill"]={
30126,
@ -1288,8 +1288,8 @@ local monster_dungeon_equip = {
},
[8106]={
["monster_base"]=10036,
["hp"]=132000000,
["atk"]=870000,
["hp"]=312170000,
["atk"]=5690000,
["atk_times"]=3,
["hurt_skill"]={
20103,
@ -1303,8 +1303,8 @@ local monster_dungeon_equip = {
},
[8206]={
["monster_base"]=10017,
["hp"]=284280000,
["atk"]=4890000,
["hp"]=376280000,
["atk"]=7800000,
["atk_times"]=3,
["hurt_skill"]={
20046,
@ -1318,8 +1318,8 @@ local monster_dungeon_equip = {
},
[8306]={
["monster_base"]=10023,
["hp"]=463670000,
["atk"]=5380000,
["hp"]=711080000,
["atk"]=8610000,
["atk_times"]=3,
["hurt_skill"]={
20064,
@ -1333,8 +1333,8 @@ local monster_dungeon_equip = {
},
[8406]={
["monster_base"]=10051,
["hp"]=616180000,
["atk"]=5640000,
["hp"]=912460000,
["atk"]=9020000,
["atk_times"]=3,
["hurt_skill"]={
20148,
@ -1349,8 +1349,8 @@ local monster_dungeon_equip = {
[8506]={
["monster_base"]=20040,
["is_boss"]=2,
["hp"]=1112410000,
["atk"]=5750000,
["hp"]=1655840000,
["atk"]=9450000,
["atk_times"]=4,
["hurt_skill"]={
30141,
@ -1368,8 +1368,8 @@ local monster_dungeon_equip = {
},
[8606]={
["monster_base"]=10021,
["hp"]=251150000,
["atk"]=3770000,
["hp"]=339080000,
["atk"]=6160000,
["atk_times"]=3,
["hurt_skill"]={
20058,
@ -1383,8 +1383,8 @@ local monster_dungeon_equip = {
},
[8706]={
["monster_base"]=10034,
["hp"]=293630000,
["atk"]=5170000,
["hp"]=408050000,
["atk"]=8450000,
["atk_times"]=3,
["hurt_skill"]={
20097,
@ -1398,8 +1398,8 @@ local monster_dungeon_equip = {
},
[8806]={
["monster_base"]=10030,
["hp"]=478890000,
["atk"]=5680000,
["hp"]=771120000,
["atk"]=9340000,
["atk_times"]=3,
["hurt_skill"]={
20085,
@ -1413,8 +1413,8 @@ local monster_dungeon_equip = {
},
[8906]={
["monster_base"]=10018,
["hp"]=636450000,
["atk"]=5960000,
["hp"]=986810000,
["atk"]=9790000,
["atk_times"]=3,
["hurt_skill"]={
20049,
@ -1429,8 +1429,8 @@ local monster_dungeon_equip = {
[9006]={
["monster_base"]=20039,
["is_boss"]=2,
["hp"]=1148710000,
["atk"]=6080000,
["hp"]=1790630000,
["atk"]=10230000,
["atk_times"]=4,
["hurt_skill"]={
30117,
@ -1448,8 +1448,8 @@ local monster_dungeon_equip = {
},
[9106]={
["monster_base"]=10016,
["hp"]=261840000,
["atk"]=3970000,
["hp"]=357560000,
["atk"]=6490000,
["atk_times"]=3,
["hurt_skill"]={
20043,
@ -1463,8 +1463,8 @@ local monster_dungeon_equip = {
},
[9206]={
["monster_base"]=10054,
["hp"]=305680000,
["atk"]=5440000,
["hp"]=429930000,
["atk"]=8920000,
["atk_times"]=3,
["hurt_skill"]={
20157,
@ -1478,8 +1478,8 @@ local monster_dungeon_equip = {
},
[9306]={
["monster_base"]=10006,
["hp"]=498740000,
["atk"]=5980000,
["hp"]=812430000,
["atk"]=9840000,
["atk_times"]=2,
["hurt_skill"]={
20016,
@ -1493,8 +1493,8 @@ local monster_dungeon_equip = {
},
[9406]={
["monster_base"]=10020,
["hp"]=662690000,
["atk"]=6280000,
["hp"]=1039660000,
["atk"]=10320000,
["atk_times"]=3,
["hurt_skill"]={
20055,
@ -1509,8 +1509,8 @@ local monster_dungeon_equip = {
[9506]={
["monster_base"]=20043,
["is_boss"]=2,
["hp"]=1196050000,
["atk"]=6410000,
["hp"]=1886200000,
["atk"]=10790000,
["atk_times"]=4,
["hurt_skill"]={
30120,
@ -1529,8 +1529,8 @@ local monster_dungeon_equip = {
},
[9606]={
["monster_base"]=10031,
["hp"]=270070000,
["atk"]=4190000,
["hp"]=375760000,
["atk"]=6820000,
["atk_times"]=3,
["hurt_skill"]={
20088,
@ -1544,8 +1544,8 @@ local monster_dungeon_equip = {
},
[9706]={
["monster_base"]=10035,
["hp"]=315240000,
["atk"]=5740000,
["hp"]=451810000,
["atk"]=9380000,
["atk_times"]=3,
["hurt_skill"]={
20100,
@ -1559,8 +1559,8 @@ local monster_dungeon_equip = {
},
[9806]={
["monster_base"]=10019,
["hp"]=514070000,
["atk"]=6320000,
["hp"]=853590000,
["atk"]=10350000,
["atk_times"]=3,
["hurt_skill"]={
20052,
@ -1574,8 +1574,8 @@ local monster_dungeon_equip = {
},
[9906]={
["monster_base"]=10013,
["hp"]=682910000,
["atk"]=6630000,
["hp"]=1092340000,
["atk"]=10850000,
["atk_times"]=3,
["hurt_skill"]={
20034,
@ -1590,8 +1590,8 @@ local monster_dungeon_equip = {
[10006]={
["monster_base"]=20042,
["is_boss"]=2,
["hp"]=1232640000,
["atk"]=6760000,
["hp"]=1981770000,
["atk"]=11340000,
["atk_times"]=4,
["hurt_skill"]={
30144,

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

@ -4571,7 +4571,7 @@ local skill = {
["type"]="lethargy",
["num"]=0,
["ratio"]=5000,
["round"]=2
["round"]=1
}
},
["obj"]=2,
@ -4694,7 +4694,71 @@ local skill = {
{
["type"]="lethargy",
["num"]=0,
["ratio"]=5000,
["ratio"]=8000,
["round"]=2
}
},
["obj"]=2,
["effect_block"]={
1,
2,
4
},
["skill_position"]={
2,
0
},
["shake_time"]=200,
["shake_type"]=5,
["sound"]=34002200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["fx_self"]=300109,
["bullet_time"]={
1000,
3000,
400
},
["fx_self_mirror"]=400109
},
[3400224]={
["buff_id"]={
"lethargy"
},
["energy"]=10,
["link"]=1,
["position"]=3,
["method"]=1,
["skill_type"]=4,
["boardrange"]={
},
["battle_icon"]="23",
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt_green",
["num"]=13000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_green",
["num"]=13000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_green",
["num"]=24000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="lethargy",
["num"]=0,
["ratio"]=8000,
["round"]=2
}
},
@ -7553,7 +7617,7 @@ local skill = {
},
["name_act"]="attack01",
["fx_self"]=300112,
["fx_self_mirror"]=400127
["fx_self_mirror"]=400112
},
[5400211]={
["position"]=5,
@ -7579,7 +7643,7 @@ local skill = {
},
["name_act"]="attack02",
["fx_self"]=300113,
["fx_self_mirror"]=400128
["fx_self_mirror"]=400113
},
[5400212]={
["position"]=5,
@ -7605,7 +7669,7 @@ local skill = {
},
["name_act"]="attack03",
["fx_self"]=300114,
["fx_self_mirror"]=400129
["fx_self_mirror"]=400114
},
[5400213]={
["position"]=5,
@ -7631,7 +7695,7 @@ local skill = {
},
["name_act"]="attack04",
["fx_self"]=300115,
["fx_self_mirror"]=400130
["fx_self_mirror"]=400115
},
[5400220]={
["energy"]=10,
@ -7703,7 +7767,7 @@ local skill = {
3000,
400
},
["fx_self_mirror"]=400131
["fx_self_mirror"]=400116
},
[5400221]={
["position"]=5,
@ -7833,7 +7897,7 @@ local skill = {
},
["name_act"]="attack01",
["fx_self"]=300127,
["fx_self_mirror"]=400112
["fx_self_mirror"]=400127
},
[5400311]={
["position"]=5,
@ -7859,7 +7923,7 @@ local skill = {
},
["name_act"]="attack02",
["fx_self"]=300128,
["fx_self_mirror"]=400113
["fx_self_mirror"]=400128
},
[5400312]={
["position"]=5,
@ -7885,7 +7949,7 @@ local skill = {
},
["name_act"]="attack03",
["fx_self"]=300129,
["fx_self_mirror"]=400114
["fx_self_mirror"]=400129
},
[5400313]={
["position"]=5,
@ -7911,7 +7975,7 @@ local skill = {
},
["name_act"]="attack04",
["fx_self"]=300130,
["fx_self_mirror"]=400115
["fx_self_mirror"]=400130
},
[5400320]={
["buff_id"]={
@ -7958,7 +8022,7 @@ local skill = {
3000,
400
},
["fx_self_mirror"]=400116
["fx_self_mirror"]=400131
},
[5400321]={
["position"]=5,
@ -27380,6 +27444,6 @@ local skill = {
}
}
local config = {
data=skill,count=984
data=skill,count=985
}
return config

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

@ -2223,11 +2223,11 @@ local skill_rogue = {
["skill_position"]=2,
["boardrange"]={
{
["type"]=1,
["type"]=3,
["range"]=2
},
{
["type"]=2,
["type"]=4,
["range"]=2
}
},
@ -2277,11 +2277,11 @@ local skill_rogue = {
["skill_position"]=2,
["boardrange"]={
{
["type"]=3,
["type"]=1,
["range"]=2
},
{
["type"]=4,
["type"]=2,
["range"]=2
}
},
@ -2967,10 +2967,9 @@ local skill_rogue = {
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,
["type"]=16,
["type"]=1,
["parameter"]={
4,
3000
3400224
},
["skill_position"]=3,
["icon"]="213"
@ -3013,6 +3012,8 @@ local skill_rogue = {
["icon"]="215"
},
[3400207]={
["unlock"]=3400204,
["cover_unlock"]=3400204,
["limit_times"]=1,
["weight"]=3000,
["qlt"]=4,

28
lua/app/config/skin.lua
View File

@ -23,6 +23,32 @@ local skin = {
["skin_point"]=0,
["hero_id"]=14001
},
[1400101]={
["model_id"]="p0036",
["qlt"]=3,
["bonus"]={
{
["type"]="attr_skill_hurtp_red",
["num"]=1000
},
{
["type"]="attr_hpp_red",
["num"]=1000
}
},
["icon"]="skin_5",
["got"]=1,
["skin_point"]=10,
["hero_id"]=14001,
["item_id"]=1400101,
["skill_show"]={
14001011,
14001012,
14001013,
14001014,
14001015
}
},
[14002]={
["model_id"]="p0018",
["qlt"]=1,
@ -285,6 +311,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

76
lua/app/config/skin_skill.lua
View File

@ -302,9 +302,83 @@ local skin_skill = {
["fx_bg"]=300148,
["fx_self_mirror"]=400144,
["fx_bg_mirror"]=400148
},
[14001011]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=2,
["sound_hit"]={
1000011
},
["name_act"]="attack01",
["fx_self"]=300045,
["fx_self_mirror"]=400078
},
[14001012]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=2,
["sound_hit"]={
1000012
},
["name_act"]="attack02",
["fx_self"]=300046,
["fx_self_mirror"]=400079
},
[14001013]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=4,
["sound_hit"]={
1000013
},
["name_act"]="attack03",
["fx_self"]=300047,
["fx_self_mirror"]=400080
},
[14001014]={
["skill_position"]={
2,
0
},
["shake_time"]=100,
["shake_type"]=1,
["sound_hit"]={
1000014
},
["name_act"]="attack04",
["fx_self"]=300048,
["fx_self_mirror"]=400081
},
[14001015]={
["skill_position"]={
2,
0
},
["shake_time"]=200,
["shake_type"]=6,
["sound"]=14001200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["fx_self"]=300150,
["bullet_time"]={
1166,
3000,
200
},
["fx_self_mirror"]=400150
}
}
local config = {
data=skin_skill,count=20
data=skin_skill,count=25
}
return config

8
lua/app/config/strings/cn/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="巨力锤,战者之锤,流星巨锤,破军锤,断魂锤,陨星"
},
[1400102]={
["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠"
},
[1400103]={
["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠"
["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍"
},
[1400104]={
["name"]="皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链,铜制手环"
["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索"
},
[1400105]={
["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲"
},
[1400201]={
["name"]="猫拳,尖刺猫拳,青钢猫拳,裂伤猫拳,破空猫拳,福神之力"

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

@ -448,6 +448,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "可能出<color=#ff8bf8>史诗</color>哦~",
["ARENA_DESC_36"] = "试试手气",
["ONE_KEY_GET_DESC"] = "一键领取",
["ACTIVITY_OVER_EDSC"] = "活动已结束",
["PART_IN_DESC"] = "参与",
["HERO_FUND_DESCC_1"] = "新活动月之祝福开启",
["HERO_FUND_DESCC_2"] = "月之祝福",
["HERO_FUND_DESCC_3"] = "拥有月之祝福后，在战斗中累计通过波次可获得丰厚奖励。",
["HERO_FUND_DESCC_4"] = "新活动14日达标开启",
["ARENA_DESC_37"] = "解锁英雄：",
["ARENA_DESC_38"] = "已解锁英雄：",
["ARENA_DESC_39"] = "升段奖励为一次性奖励",
["ARENA_DESC_40"] = "升段奖励",
["ARENA_DESC_41"] = "结算奖励",
["ARENA_DESC_42"] = "未领取奖励",
["EQUIP_DESC_26"] = "武器直升{0}级礼包",
["EQUIP_DESC_27"] = "防具直升{0}级礼包",
["SEIZED_DESC_1"] = "检测到你的账号存在异常，请联系客服或删除账号使用新建账号继续游戏。",
["SEIZED_DESC_2"] = "联系客服",
["SEIZED_DESC_3"] = "删除账号",
}
return localization_global

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

@ -42,7 +42,7 @@ local skill = {
["desc"]="流星追月：使用后本次伤害提升，并造成一次巨量技能伤害。"
},
[3400220]={
["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color>效果，<color=#3cff28>2</color>回合。"
["desc"]="美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color>效果，<color=#3cff28>1</color>回合。"
},
[4200120]={
["desc"]="元素链接：随机消除<color=#3cff28>3</color>个元素，并造成一次技能伤害。"

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="流星追月链接<color=#3cff28>4</color>个元素或以上时，流星追月攻击将释放<color=#3cff28>2</color>次。"
},
[3400200]={
["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28>昏睡</color>效果，<color=#3cff28>2</color>回合。"
["desc"]="解锁美丽梦魇：额外造成一次大量技能伤害，50%概率附加<color=#3cff28>昏睡</color>效果，<color=#3cff28>1</color>回合。"
},
[3400201]={
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="美丽梦魇沿X方向可额外消除<color=#3cff28>4</color>格。"
},
[3400204]={
["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>80%</color>。"
["desc"]="美丽梦魇附加的<color=#3cff28>昏睡</color>效果，概率提升到<color=#3cff28>80%</color>，回合数<color=#3cff28>+1</color>。"
},
[3400205]={
["desc"]="<color=#fcff28>Combo</color>:梦魔普攻<color=#3cff28>昏睡</color>敌人将附加<color=#3cff28>禁锢</color>效果，<color=#3cff28>2</color>回合。"

5
lua/app/config/strings/cn/skin.lua
View File

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="初始"
},
[1400101]={
["value"]="遗迹战甲"
},
[14002]={
["value"]="初始"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

5
lua/app/config/strings/de/skin.lua
View File

@ -10,6 +10,9 @@ local skin = {
},
[14001]={
},
[1400101]={
},
[14002]={
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/en/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="Mighty Mallet,Warrior's Hammer,Comet Crusher,Annihilator's Hammer,Soulshatter,Falling Star"
},
[1400102]={
["name"]="Rugged Steel Helm,Fine Steel Visor,Obsidian Noble Crown,Gallant Coronet,Dragonhorn Circlet,Eternal Glory Crown"
["name"]="Floral Circlet,Pearl Circlet,Flame Gilded Circlet,Serene Jade Circlet,Starry Phoenix Circlet,Supreme Crown"
},
[1400103]={
["name"]="Thick Woven Vestment,Thin Steel Hauberk,Dark Iron Plate,Champion's Jade Armor,Wyrmhide Golden Plate,Eternal Heavy Plate"
["name"]="Soft Leather Robe,Jade-Adorned Robe,Purple Gauze Silk,Amber-hued Robe,Phoenix Feather Robe,Sovereign Celestial Robe"
},
[1400104]={
["name"]="Leather Belt,Ebony Gold Waistband,Knight's Baldric,Wyrm Sinew Belt,Eternal Girth,Bronze Bracelet"
["name"]="Embroidered Belt,Elegant Waist Band,Pearl-embroidered Belt,Astral Glory Belt,Phoenix Gaze Belt,Ultimate Immortal Belt"
},
[1400105]={
["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands"
["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards"
},
[1400201]={
["name"]="Cat's Claw,Spiked Claw,Azure Steel Claw,Shredding Claw,Sky-Cleaving Claw,Fortune's Blessing"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "You might obtain <color=#ff8bf8>Epic</color>~",
["ARENA_DESC_36"] = "Try",
["ONE_KEY_GET_DESC"] = "Claim All",
["ACTIVITY_OVER_EDSC"] = "Event has ended",
["PART_IN_DESC"] = "Participate",
["HERO_FUND_DESCC_1"] = "New event [Lunar Benediction] is open",
["HERO_FUND_DESCC_2"] = "Lunar Benediction",
["HERO_FUND_DESCC_3"] = "With the Lunar Benediction, obtain rewards by progressing through waves in battles.",
["HERO_FUND_DESCC_4"] = "New event [Advanced Challenge] is open",
["ARENA_DESC_37"] = "Unlock Hero:",
["ARENA_DESC_38"] = "Unlocked Heroes:",
["ARENA_DESC_39"] = "Promotion rewards are one-time",
["ARENA_DESC_40"] = "Promotion Rewards",
["ARENA_DESC_41"] = "Settlement Rewards",
["ARENA_DESC_42"] = "Unclaimed Rewards",
["EQUIP_DESC_26"] = "Weapon Upgrade Lv.{0} Pack",
["EQUIP_DESC_27"] = "Armor Upgrade Lv.{0} Pack",
["SEIZED_DESC_1"] = "Detected abnormality on your account. Please contact customer service or delete the account and continue playing with a new account.",
["SEIZED_DESC_2"] = "Customer Service",
["SEIZED_DESC_3"] = "Delete Account",
}
return localization_global

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

@ -42,7 +42,7 @@ local skill = {
["desc"]="Moon Chaser: Increase damage and deal significantly skill damage once."
},
[3400220]={
["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> 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> that lasts <color=#3cff28>1</color> turns."
},
[4200120]={
["desc"]="Elemental Link: Clear <color=#3cff28>3</color> random elements and deal skill damage once."

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="When Moonchaser links to <color=#3cff28>4</color> or more elements, it will be cast <color=#3cff28>2</color> times."
},
[3400200]={
["desc"]="Unlock 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"]="Unlock 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>1</color> turns."
},
[3400201]={
["desc"]="Alluring Nightmare can clear additional <color=#3cff28>4</color> grids in the X direction."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Alluring Nightmare can clear additional <color=#3cff28>4</color> grids in the X direction."
},
[3400204]={
["desc"]="The chance of Drowsy inflicted by Alluring Nightmare increases to <color=#3cff28>80%</color>."
["desc"]="The chance of <color=#3cff28>Drowsy</color> inflicted by Alluring Nightmare increases to <color=#3cff28>80%</color> for <color=#3cff28>+1</color> turn."
},
[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."

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

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="Initial"
},
[1400101]={
["value"]="Relic Armor"
},
[14002]={
["value"]="Initial"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/es/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="Martillo Potente,Martillo de Guerrero,Martillo de Meteorito,Martillo Atacante,Martillo Letal,Estrella Fugaz"
},
[1400102]={
["name"]="Visera de Acero Bruto,Visera de Acero Fino,Corona de obsidiana,Corona de héroe,Corona de Cuerno de Dragón,Corona Eterna"
["name"]="Corona Floral,Corona con Perlas,Corona de Fuego,Corona de Jade,Corona de Fénix,Corona Suprema"
},
[1400103]={
["name"]="Túnica Gruesa,Armadura de Acero Delgado,Armadura Pesada,Armadura de Jade,Casco Dorado de Escamas de Dragón,Armadura Pesada Eterna"
["name"]="Forro de Cuero Suave,Túnica con Jade,Satén Morado,Túnica de Ámbar,Túnica con Pluma de Fénix,Túnica de Estrella Suprema"
},
[1400104]={
["name"]="Cinturón de Cuero,Faja de Oro Negro,Faja de Jinete,Faja de Tendón de Dragón,Cadena de Cintura Eterna,Pulsera de Cobre"
["name"]="Cinturón Bordado,Corsé Elegante,Cinturón Bordado con Perlas,Cinturón Imperial de Estrella,Cinturón de Ojos de Fénix,Cuerda Suprema"
},
[1400105]={
["name"]="Pulsera de Cobre,Muñequera de Cuero,Muñequera de Hierro,Guanteletes de Héroe,Muñequera de Barba de Dragón,Muñequera Eterna"
["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema"
},
[1400201]={
["name"]="Golpe de gato,Puño con Pinchos,Puño de Acero Verde,Puño Lacerante,Puño en Cielo ,Poder de Fortuna"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "Héroe <color=#ff8bf8>épico</color> posible",
["ARENA_DESC_36"] = "Prueba tu suerte",
["ONE_KEY_GET_DESC"] = "Colectar todo",
["ACTIVITY_OVER_EDSC"] = "El evento ha terminado",
["PART_IN_DESC"] = "Participar",
["HERO_FUND_DESCC_1"] = "Comienza el nuevo evento: Bendición de la Luna",
["HERO_FUND_DESCC_2"] = "Bendición de la Luna",
["HERO_FUND_DESCC_3"] = "Con Bendición de la Luna, obtendrás generosas recompensas pasando las olas en la batalla.",
["HERO_FUND_DESCC_4"] = "Comienza el nuevo evento: Desafío Avanzado",
["ARENA_DESC_37"] = "Héroes bloqueados:",
["ARENA_DESC_38"] = "Héroes desbloqueados:",
["ARENA_DESC_39"] = "Las recompensas de subida de ranking se conceden una sola vez",
["ARENA_DESC_40"] = "Recompensas de Subida de Ranking",
["ARENA_DESC_41"] = "Recompensas de Clasificación",
["ARENA_DESC_42"] = "Recompensas no colectadas",
["EQUIP_DESC_26"] = "Paquete de Mejora de Arma al Nv. {0}",
["EQUIP_DESC_27"] = "Paquete de Mejora de Armadura al Nv. {0}",
["SEIZED_DESC_1"] = "Se ha detectado una anomalía en tu cuenta. Por favor contacta con Atención al Cliente, o elimina la cuenta actual y crear una nueva para continuar el juego.",
["SEIZED_DESC_2"] = "Atención al Cliente",
["SEIZED_DESC_3"] = "Eliminar Cuenta",
}
return localization_global

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

@ -42,7 +42,7 @@ local skill = {
["desc"]="Danza de Meteoro: aumenta el daño y causa un golpe adicional de enorme daño de habilidad."
},
[3400220]={
["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> 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> durante <color=#3cff28>1</color> rondas."
},
[4200120]={
["desc"]="Enlace de Elementos: elimina <color=#3cff28>3</color> elementos aleatorios y causa un daño de habilidad."

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="Cuando Espada de Fantasía enlaza <color=#3cff28>4</color> o más elementos, lanzará <color=#3cff28>2</color> ataques."
},
[3400200]={
["desc"]="Desbloquea 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"]="Desbloquea Pesadilla Hermosa: causa un masivo daño de habilidad adicional, con un <color=#3cff28>50%</color> de chance de aplicar Dormido durante <color=#3cff28>1</color> rondas."
},
[3400201]={
["desc"]="Pesadilla Hermosa elimina <color=#3cff28>4</color> bloques extras en direcciones de X."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Pesadilla Hermosa elimina <color=#3cff28>4</color> bloques extras en direcciones de X."
},
[3400204]={
["desc"]="Aumenta el chance de <color=#3cff28>Dormido</color> aplicado por Pesadilla Hermosa a <color=#3cff28>80%</color>."
["desc"]="Aumenta el chance de <color=#3cff28>Dormido</color> aplicado por Pesadilla Hermosa a <color=#3cff28>80%</color> durante <color=#3cff28>+1</color> rondas."
},
[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."

5
lua/app/config/strings/es/skin.lua
View File

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="Inicial"
},
[1400101]={
["value"]="Armadura de Ruinas"
},
[14002]={
["value"]="Inicial"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

5
lua/app/config/strings/fr/skin.lua
View File

@ -10,6 +10,9 @@ local skin = {
},
[14001]={
},
[1400101]={
},
[14002]={
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/id/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="Mallet Perkasa,Palu Prajurit,Penghancur Komet,Palu Pemusnah,Penghancur Jiwa,Bintang Jatuh"
},
[1400102]={
["name"]="Helm Baja Kasar,Pelindung Baja Halus,Mahkota Obsidian,Coronet Perkasa,Circlet Tanduk Naga,Mahkota Kemuliaan Abadi"
["name"]="Circlet Bunga,Circlet Mutiara,Circlet Api Emas,Circlet Giok,Circlet Phoenix,Mahkota Agung"
},
[1400103]={
["name"]="Jubah Tenun Tebal,Armor Cincin Baja Tipis,Plat Besi Gelap,Armor Giok Sang Juara,Plat Emas Wyrmhide,Plat Berat Abadi"
["name"]="Jubah Kulit Lembut,Jubah Giok,Sutra Kasa Ungu,Jubah Amber,Jubah Bulu Phoenix,Jubah Bintang Daulat"
},
[1400104]={
["name"]="Sabuk Kulit,Tali Pinggang Emas Eboni,Ksatria Baldric,Sabuk Otot Wyrm,Lingkar Kekal,Gelang Bronze"
["name"]="Sabuk Bordir,Tali Pinggang Elegan,Sabuk Mutiara,Sabuk Astral,Sabuk Phoenix,Sabuk Abadi"
},
[1400105]={
["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi"
["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung"
},
[1400201]={
["name"]="Cakar Kucing,Cakar Duri,Cakar Baja Azure,Cakar Pencabik,Cakar Pembelah Langit,Berkah Keberuntungan"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "Mungkin dapat <color=#ff8bf8>Epik</color>",
["ARENA_DESC_36"] = "Coba",
["ONE_KEY_GET_DESC"] = "Klaim Cepat",
["ACTIVITY_OVER_EDSC"] = "Event telah berakhir",
["PART_IN_DESC"] = "Partisipasi",
["HERO_FUND_DESCC_1"] = "Event baru Berkah Lunar dibuka",
["HERO_FUND_DESCC_2"] = "Berkah Lunar",
["HERO_FUND_DESCC_3"] = "Dapatkan hadiah melimpah dengan melewati ombak dalam pertempuran saat memiliki Berkah Lunar.",
["HERO_FUND_DESCC_4"] = "Event baru Tantangan Advanced dibuka",
["ARENA_DESC_37"] = "Buka Hero:",
["ARENA_DESC_38"] = "Hero terbuka:",
["ARENA_DESC_39"] = "Hadiah promosi hanya satu kali",
["ARENA_DESC_40"] = "Hadiah Promosi",
["ARENA_DESC_41"] = "Hadiah Penyelesaian",
["ARENA_DESC_42"] = "Hadiah yang belum diklaim",
["EQUIP_DESC_26"] = "Pack Peningkatan Senjata Lv.{0}",
["EQUIP_DESC_27"] = "Pack upgrade Armor Lv.{0}",
["SEIZED_DESC_1"] = "Telah terdeteksi kondisi tidak normal pada akunmuu. Silakan hubungi layanan pelanggan atau hapus akun, dan gunakan akun baru untuk melanjutkan permainan.",
["SEIZED_DESC_2"] = "Hubungi Layanan Pelanggan",
["SEIZED_DESC_3"] = "Hapus Akun",
}
return localization_global

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

@ -42,7 +42,7 @@ local skill = {
["desc"]="Pemburu Bulan: Meningkatkan DMG dan memberikan DMG skill yang besar sekali."
},
[3400220]={
["desc"]="Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28><color=#fcb501><u>Kantuk</u></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> selama <color=#3cff28>1</color> giliran."
},
[4200120]={
["desc"]="Link Elemen: Menghilangkan <color=#3cff28>3</color> elemen secara acak dan memberikan DMG skill."

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="Saat Pemburu Bulan menautkan <color=#3cff28>4</color> atau lebih banyak elemen, maka ATK Pemburu Bulan akan dilepaskan sebanyak <color=#3cff28>2</color> kali."
},
[3400200]={
["desc"]="Membuka Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28>Kantuk</color> selama <color=#3cff28>2</color> giliran."
["desc"]="Membuka Nightmare Z: Menyebabkan DMG skill tambahan dalam jumlah besar dengan 50% peluang efek <color=#3cff28>Kantuk</color> selama <color=#3cff28>1</color> giliran."
},
[3400201]={
["desc"]="Nightmare Z dapat menghapus <color=#3cff28>4</color> grid tambahan pada arah X."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Nightmare Z dapat menghapus <color=#3cff28>4</color> grid tambahan pada arah X."
},
[3400204]={
["desc"]="Efek <color=#3cff28>Kantuk</color> Nightmare Z meningkatkan peluang hingga <color=#3cff28>80%</color>。"
["desc"]="Peluang <color=#3cff28>Kantuk</color> yang ditimbulkan oleh Nightmare Z meningkat <color=#3cff28>80%</color> selama <color=#3cff28>+1</color> giliran."
},
[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."

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

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="Awal"
},
[1400101]={
["value"]="Armor Relik"
},
[14002]={
["value"]="Awal"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/ja/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="マイティマレット,戦士のハンマー,彗星クラッシャー,破壊ハンマー,ソウルシャッター,流れ星"
},
[1400102]={
["name"]="鋼の仮面,ファインスチール製仮面,黒曜石の冠,勇気の冠,竜角の冠,永遠の冠"
["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし"
},
[1400103]={
["name"]="厚織りの法衣,薄鋼鉄製ハウバーク,玄鉄の鎧,強者の鎧,竜鱗の鎧,永遠の鎧"
["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ"
},
[1400104]={
["name"]="革ベルト,黒檀ゴールドのガードル,騎士のベルト,竜腱のガードル,永遠のガードル,銅のブレスレット"
["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ"
},
[1400105]={
["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド"
["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット"
},
[1400201]={
["name"]="猫の爪,トゲの爪,鋼の爪,裂傷の爪,空を切り裂く爪,福神の力"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "<color=#ff8bf8>エピック</color>を獲得可能~",
["ARENA_DESC_36"] = "運試し",
["ONE_KEY_GET_DESC"] = "一括受取",
["ACTIVITY_OVER_EDSC"] = "イベントは終了しました",
["PART_IN_DESC"] = "参加する",
["HERO_FUND_DESCC_1"] = "新イベント月の祝福が解放",
["HERO_FUND_DESCC_2"] = "月の祝福",
["HERO_FUND_DESCC_3"] = "月の祝福を入手した後、バトル中にクリア回数を累計すると豪華な報酬を獲得できます。",
["HERO_FUND_DESCC_4"] = "新イベントランクアップ挑戦が解放",
["ARENA_DESC_37"] = "ヒーロー解放：",
["ARENA_DESC_38"] = "解放済のヒーロー：",
["ARENA_DESC_39"] = "ランクアップ報酬は一回のみ受取可能です",
["ARENA_DESC_40"] = "ランクアップ報酬",
["ARENA_DESC_41"] = "決算報酬",
["ARENA_DESC_42"] = "未受取の報酬",
["EQUIP_DESC_26"] = "武器Lv{0}レベルアップパック",
["EQUIP_DESC_27"] = "防具Lv{0}レベルアップパック",
["SEIZED_DESC_1"] = "アカウントに異常が検出されました。サポートセンターに連絡するか、アカウントを削除し、新しいアカウントを作成してゲームを続行してください。",
["SEIZED_DESC_2"] = "サポートセンターに連絡する",
["SEIZED_DESC_3"] = "アカウントを削除する",
}
return localization_global

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

@ -42,7 +42,7 @@ local skill = {
["desc"]="ムーンチェイサー：発動するターンダメージがアップ、特⼤ダメージを与えるスキルを1回発動する。"
},
[3400220]={
["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>2</color>ターン<color=#3cff28><color=#fcb501><u>昏睡</u></color>効果を付与する。"
["desc"]="アリュールナイトメア：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28><color=#fcb501><u>昏睡</u></color>効果を付与する。"
},
[4200120]={
["desc"]="元素連接：ランダムで<color=#3cff28>3</color>つの元素を消し、スキルを1回発動する。"

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="「ムーンチェイサー」は<color=#3cff28>4</color>つ以上の元素と繋がった時、ムーンチェイサーが<color=#3cff28>2</color>回発動する。"
},
[3400200]={
["desc"]="アリュールナイトメア解放：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>2</color>ターン<color=#3cff28>昏睡</color>効果を付与する。"
["desc"]="アリュールナイトメア解放：追加で大ダメージを与えるスキルを1回発動し、50%の確率で敵に<color=#3cff28>1</color>ターン<color=#3cff28>昏睡</color>効果を付与する。"
},
[3400201]={
["desc"]="「アリュールナイトメア」は追加でX方向<color=#3cff28>4</color>マスを消す。"
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="「アリュールナイトメア」は追加でX方向<color=#3cff28>4</color>マスを消す。"
},
[3400204]={
["desc"]="「アリュールナイトメア」の<color=#3cff28>昏睡</color>効果の確率は<color=#3cff28>80%</color>に増加する。"
["desc"]="「アリュールナイトメア」の<color=#3cff28>昏睡</color>効果の確率は<color=#3cff28>80%</color>に増加し、ターン数が<color=#3cff28>+1</color>。"
},
[3400205]={
["desc"]="<color=#fcff28>ヒット</color>:夢魔の通常攻撃が<color=#3cff28>昏睡</color>状態の敵に<color=#3cff28>2</color>ターン<color=#3cff28>拘束</color>効果を付与する。"

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

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="デフォルト"
},
[1400101]={
["value"]="レリックアーマー"
},
[14002]={
["value"]="デフォルト"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/ko/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="힘센 망치,워리어의 망치,유성 망치,장군의 망치,영혼 파괴 망치,떨어지는 별"
},
[1400102]={
["name"]="거친 강철 마스크,정교한 강철 마스크,어둠의 노블 왕관,용맹의 왕관,용의 뿔로 만든 왕관,화려한 영원의 왕관"
["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관"
},
[1400103]={
["name"]="두꺼운 니트 두루마기,얇은 강철 갑옷,검은 빛을 띤 무거운 중갑,강자의 옥 갑옷,용비늘 황금 투구,영원의 중갑"
["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브"
},
[1400104]={
["name"]="가죽 벨트,검은 황금 허리띠,기사의 벨트,용의 힘줄 허리띠,영원의 허리띠 장식,브론즈 팔찌"
["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트"
},
[1400105]={
["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대"
["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머"
},
[1400201]={
["name"]="고양이 펀치,손톱 세운 고양이 펀치,브론즈 고양이 펀치,거친 고양이 펀치,무시무시한 고양이 펀치,행운의 신이 내린 축복"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "행운의 신이 당신에게 미소 짓는다면 <color=#ff8bf8>에픽</color> 품질을 손에 넣을 수도 있습니다~",
["ARENA_DESC_36"] = "시도해보기",
["ONE_KEY_GET_DESC"] = "모두 받기",
["ACTIVITY_OVER_EDSC"] = "이벤트가 종료되었습니다.",
["PART_IN_DESC"] = "참여",
["HERO_FUND_DESCC_1"] = "새로운 이벤트 달의 축복이 시작됩니다.",
["HERO_FUND_DESCC_2"] = "달의 축복",
["HERO_FUND_DESCC_3"] = "달의 축복을 받게 되면 전투에서 클리어한 웨이브를 누적하여 푸짐한 보상을 받을 수 있습니다.",
["HERO_FUND_DESCC_4"] = "신규 이벤트 고급 도전 오픈",
["ARENA_DESC_37"] = "영웅 잠금 해제:",
["ARENA_DESC_38"] = "잠금 해제된 영웅:",
["ARENA_DESC_39"] = "승급 보상은 일회성 보상입니다.",
["ARENA_DESC_40"] = "승급 보상",
["ARENA_DESC_41"] = "정산 보상",
["ARENA_DESC_42"] = "미수령 보상",
["EQUIP_DESC_26"] = "무기 {0}레벨 업그레이드 패키지",
["EQUIP_DESC_27"] = "방어구 {0}레벨 업그레이드 패키지",
["SEIZED_DESC_1"] = "계정에 이상이 발견되었습니다. 문제 해결을 위해 고객 서비스에 문의하거나 계정을 삭제하시고 새 계정을 사용하여 게임을 계속 진행하시기 바랍니다.",
["SEIZED_DESC_2"] = "고객 서비스 문의",
["SEIZED_DESC_3"] = "계정 삭제",
}
return localization_global

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

@ -42,7 +42,7 @@ local skill = {
["desc"]="유성과 달의 숨바꼭질: 사용 후, 이번 공격 대미지가 상승하며 엄청난 양의 스킬 피해를 한 번 입힙니다."
},
[3400220]={
["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>2</color>턴 동안 <color=#3cff28><color=#fcb501><u>수면</u></color> 효과를 부여합니다."
["desc"]="아름다운 악몽: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>1</color>턴 동안 <color=#3cff28><color=#fcb501><u>수면</u></color> 효과를 부여합니다."
},
[4200120]={
["desc"]="원소 연결: 무작위로 <color=#3cff28>3</color>개의 원소를 소멸하고 스킬 피해를 한 번 입힙니다."

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="유성과 달의 숨바꼭질이 <color=#3cff28>4</color>개 또는 그 이상의 원소를 연결하면 스킬 공격을 <color=#3cff28>2</color>번 방출합니다."
},
[3400200]={
["desc"]="아름다운 악몽 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>2</color>턴 동안 <color=#3cff28> 수면</color>효과를 부여합니다."
["desc"]="아름다운 악몽 잠금 해제: 추가로 대량의 스킬 피해를 한 번 입히며 50% 확률로 <color=#3cff28>1</color>턴 동안 <color=#3cff28> 수면</color>효과를 부여합니다."
},
[3400201]={
["desc"]="아름다운 악몽이 X 방향을 따라 추가로 <color=#3cff28>4</color>개의 그리드를 소멸합니다."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="아름다운 악몽이 X 방향을 따라 추가로 <color=#3cff28>4</color>개의 그리드를 소멸할 수 있습니다."
},
[3400204]={
["desc"]="아름다운 악몽이 <color=#3cff28>수면</color> 효과를 부여할 확률이 <color=#3cff28>80%</color>로 증가합니다."
["desc"]="아름다운 악몽이 <color=#3cff28>수면</color> 효과를 부여하는 확률이 <color=#3cff28>80%</color>로 증가하고 턴 횟수 <color=#3cff28>+1</color>"
},
[3400205]={
["desc"]="<color=#fcff28>Combo</color>:인큐버스의 일반 공격이 <color=#3cff28>2</color>턴 동안 <color=#3cff28>수면</color> 상태의 적에게 <color=#3cff28>속박</color> 효과를 부여합니다."

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

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="초기"
},
[1400101]={
["value"]="유적 갑옷"
},
[14002]={
["value"]="초기"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/pt/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="Martelo Poderoso,Martelo do Combatente,Martelo do Meteoro Gigante,Martelo do Exército Quebrado,Martelo Quebra-alma,Meteorito"
},
[1400102]={
["name"]="Máscara de Aço Grosso,Elmo de Aço Refinado,Coroa de Obsidiana,Coroa da Valentia,Coroa do Chifre do Dragão,Coroa Majestosa da Eternidade"
["name"]="Coroa de Flor Comum,Tiara de Pérola,Tiara de Ouro Tece-chamas,Coroa de Jade da Lua Clara,Coroa Estrelada da Fênix,Coroa Encantadora da Supremacia"
},
[1400103]={
["name"]="Túnica Grossa,Cota de Anéis de Aço Fino,Armadura Pesada de Ferro Negro,Armadura de Jade do Valente,Couraça Dourada de Escamas de Dragão,Armadura Pesada da Eternidade"
["name"]="Vestimenta Interna de Couro Flexível,Túnica Adornada com Jade,Cetim e Gaza Roxa,Vestimenta de Âmbar,Traje Majestoso de Pena de Fênix,Túnica Estrelada da Supremacia"
},
[1400104]={
["name"]="Cinto de Couro,Cinto de Ouro Negro,Cinto do Cavaleiro,Cinta de Tendão de Dragão,Corrente de Cintura da Eternidade,Pulseira de Cobre"
["name"]="Faixa Bordada Simples,Cinta Elegante,Faixa Bordada de Pérola,Cinto da Luz Estelar,Cinta do Olhar da Fênix,Cordão Celestial da Supremacia"
},
[1400105]={
["name"]="Pulseira de Cobre,Braceletes de Couro,Braceletes de Coração de Ferro,Manoplas do Herói,Braceletes do Bigode do Dragão,Pulseiras da Eternidade"
["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia"
},
[1400201]={
["name"]="Punho de Gato,Punho de Gato Espinhoso,Punho de Gato de Aço Azul,Punho de Gato Rasgador,Punho de Gato Rompe-céus,Força do Deus da Fortuna"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "Pode aparecer um <color=#ff8bf8>Épico</color>!",
["ARENA_DESC_36"] = "Tentar a Sorte",
["ONE_KEY_GET_DESC"] = "Coletar tudo",
["ACTIVITY_OVER_EDSC"] = "O evento terminou.",
["PART_IN_DESC"] = "Participar",
["HERO_FUND_DESCC_1"] = "Começou o novo evento: Bênção da Lua",
["HERO_FUND_DESCC_2"] = "Bênção da Lua",
["HERO_FUND_DESCC_3"] = "Com a Bênção da Lua, receberá recompensas generosas acumulando o número de ondas de batalha.",
["HERO_FUND_DESCC_4"] = "Começou o novo evento: Desafio de Avanço",
["ARENA_DESC_37"] = "Heróis a desbloquear:",
["ARENA_DESC_38"] = "Heróis desbloqueados:",
["ARENA_DESC_39"] = "As recompensas de aprimoramento só podem ser coletadas uma vez.",
["ARENA_DESC_40"] = "Recompensas pela subida de ranque",
["ARENA_DESC_41"] = "Recompensas de classificação",
["ARENA_DESC_42"] = "Recompensas não coletadas",
["EQUIP_DESC_26"] = "Pacote de Melhoria de Arma a Nv.{0}",
["EQUIP_DESC_27"] = "Pacote de Melhoria de Armadura a Nv.{0}",
["SEIZED_DESC_1"] = "Foi detectada alguma anormalidade com sua conta. Entre em contato com o atendimento ao cliente ou exclua a conta atual e crie uma nova conta para continuar jogando.",
["SEIZED_DESC_2"] = "Atendimento ao Cliente",
["SEIZED_DESC_3"] = "Excluir Conta",
}
return localization_global

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

@ -42,7 +42,7 @@ local skill = {
["desc"]="Disparada do Meteoro: aumenta o dano causado no turno atual e causa um golpe de enorme dano de habilidade."
},
[3400220]={
["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> que dura <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> que dura <color=#3cff28>1</color> turnos."
},
[4200120]={
["desc"]="Elo Elemental: elimina <color=#3cff28>3</color> elementos aleatórios e causa um golpe de dano de habilidade."

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="Ao conectar <color=#3cff28>4</color> ou mais elementos com a Disparada do Meteoro, esta habilidade é lançada <color=#3cff28>2</color> vezes."
},
[3400200]={
["desc"]="Desbloquear Belo Pesadelo: causa dano adicional significativo com habilidades e tem 50% de chance de adicionar o efeito <color=#3cff28>sono</color> por <color=#3cff28>2</color> turnos."
["desc"]="Desbloquear Belo Pesadelo: causa dano adicional significativo com habilidades e tem 50% de chance de adicionar o efeito <color=#3cff28>sono</color> por <color=#3cff28>1</color> turnos."
},
[3400201]={
["desc"]="Belo Pesadelo pode eliminar <color=#3cff28>4</color> quadrados adicionais na direção X."
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="Belo Pesadelo pode eliminar <color=#3cff28>4</color> quadrados adicionais na direção X."
},
[3400204]={
["desc"]="A probabilidade do efeito <color=#3cff28>sono</color> adicionado por Belo Pesadelo aumenta para <color=#3cff28>80%</color>."
["desc"]="Aumenta a chance de acionamento do efeito <color=#3cff28>sonolento</color> pelo Pesadelo da Beleza para <color=#3cff28>80%</color>, com <color=#3cff28>+1</color> turno de duração."
},
[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."

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

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="Inicial"
},
[1400101]={
["value"]="Armadura das Ruínas"
},
[14002]={
["value"]="Inicial"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

5
lua/app/config/strings/ru/skin.lua
View File

@ -10,6 +10,9 @@ local skin = {
},
[14001]={
},
[1400101]={
},
[14002]={
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/th/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="ค้อนยักษ์,ค้อนนักรบ,ค้อนดาวตก,ค้อนทำลาย,ค้อนตัดวิญญาณ,อุกกาบาต"
},
[1400102]={
["name"]="เกราะหน้าเหล็กหยาบ,เกราะหน้าเหล็กเลิศ,มงกุฎออบซิเดียน,มงกุฎกล้าหาญ,มงกุฎเขามังกร,มงกุฎนิรันดร์"
["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม"
},
[1400103]={
["name"]="เสื้อยาวถักหนา,เกราะวงแหวนเหล็กบาง,เกราะหนักเหล็ก,เกราะหยกผู้แข็งแกร่ง,บุตรขุนนางเกล็ดมังกร,เกราะหนักนิรันดร์"
["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม"
},
[1400104]={
["name"]="เข็มขัดหนัง,คอร์เซ็ททอง,แหวนเอวอัศวิน,คอร์เซ็ทเอ็นมังกร,ห่วงโซ่เอวนิรันดร์,สร้อยข้อมือทองแดง"
["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม"
},
[1400105]={
["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์"
["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม"
},
[1400201]={
["name"]="หมัดแมว,หมัดแมวหนามแหลม,หมัดแมวเหล็กเขียว,หมัดแมวฉีกขาด,หมัดแมวทะลวง,พลังเทพโชคลาภ"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "อาจได้รับ<color=#ff8bf8>อีพิท</color>นะ~",
["ARENA_DESC_36"] = "ลองเสี่ยงโชค",
["ONE_KEY_GET_DESC"] = "รับทั้งหมด",
["ACTIVITY_OVER_EDSC"] = "กิจกรรมสิ้นสุดแล้ว",
["PART_IN_DESC"] = "เข้าร่วม",
["HERO_FUND_DESCC_1"] = "เปิดกจกรรใหม่ดวงจันทร์แล้ว",
["HERO_FUND_DESCC_2"] = "พรแห่งดวงจันทร์",
["HERO_FUND_DESCC_3"] = "หลังจากได้รับพรแห่งดวงจันทร์แล้ว สะสมผ่านจำนวนรอบในการต่อสู้จะได้รับรางวัลมากมาย",
["HERO_FUND_DESCC_4"] = "เปิดกิจกรรมใหม่ท้าทายขั้นสูแล้ว",
["ARENA_DESC_37"] = "ปลดล็อคฮีโร่:",
["ARENA_DESC_38"] = "ฮีโร่ที่ปลดล็อค:",
["ARENA_DESC_39"] = "รางวัลอัประดับเป็นรางวัลแบบครั้งเดียว",
["ARENA_DESC_40"] = "รางวัลอัประดับ",
["ARENA_DESC_41"] = "รางวัลคำนวณ",
["ARENA_DESC_42"] = "รางวัลที่ยังไม่ได้รับ",
["EQUIP_DESC_26"] = "แพ็คอัปอาวุธ {0} เลเวล",
["EQUIP_DESC_27"] = "แพ็คอัปเกราะ {0} เลเวล",
["SEIZED_DESC_1"] = "ตรวจพบบัญชีของคุณผิดปกติ โปรดติดต่อฝ่ายบริการลูกค้าหรือลบบัญชีและใช้บัญชีใหม่เพื่อเล่นเกมต่อ",
["SEIZED_DESC_2"] = "ติดต่อฝ่ายบริการลูกค้า",
["SEIZED_DESC_3"] = "ลบบัญชี",
}
return localization_global

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

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

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

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

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

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="เริ่มต้น"
},
[1400101]={
["value"]="เกราะรบซาก"
},
[14002]={
["value"]="เริ่มต้น"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/vi/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="Búa Mạnh,Búa Chiến Sĩ,Búa Sao Băng,Búa Phá Quân,Búa Đoạn Hồn,Thiên Thạch"
},
[1400102]={
["name"]="Mặt Nạ Thép Thô,Mũ Thép Tinh Thiết,Mũ Hắc Diệu,Vương Miện Anh Dũng,Mũ Sừng Rồng,Mũ Vĩnh Hằng"
["name"]="Mũ Gỗ Phàm Hoa,Mũ Ngọc Trai,Mũ Vàng Vân Lửa,Mũ Ngọc Trăng Sáng,Mũ Sao Mũ Phượng,Mũ Chí Tôn"
},
[1400103]={
["name"]="Áo Dệt Kim Dày,Giáp Thép Mỏng,Giáp Huyền Thiết,Giáp Ngọc Cường Giả,Mũ Vàng Vảy Rồng,Giáp Vĩnh Hằng"
["name"]="Áo Choàng Da,Áo Choàng Ngọc Bích,Tơ Lụa Sa Tím,Áo Hổ Phách,Trang Phục Phụng Hoàng,Áo Choàng Chí Tôn"
},
[1400104]={
["name"]="Đai Da,Đai Than Đá,Đai Kỵ Sĩ,Đai Gân Rồng,Đai Vĩnh Hằng,Vòng Tay Đồng"
["name"]="Đai Đơn Giản,Đai Thanh Lịch,Đai Ngọc Trai,Đai Ánh Sao,Đai Mắt Phượng,Dây Chí Tôn"
},
[1400105]={
["name"]="Vòng Tay Đồng,Đai Da Cổ Tay,Đai Thép Cổ Tay,Bao Tay Anh Hùng,Tay Râu Rồng,Vòng Vĩnh Hằng"
["name"]="Vòng Tay Tử Thiết,Bao Tay Nhẹ Nhàng,Bao Tay Hoàng Kim,Bao Tay Chòm Sao,Bao Tay Xương Phượng,Giáp Tay Chí Tôn"
},
[1400201]={
["name"]="Miêu Quyền,Miêu Quyền Gai Góc,Miêu Quyền Thép Xanh,Miêu Quyền Vết Rách,Miêu Quyền Phá Không,Sức Mạnh Phúc Thần"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "Có thể ra <color=#ff8bf8>Sử Thi</color>",
["ARENA_DESC_36"] = "Thử Vận May",
["ONE_KEY_GET_DESC"] = "Nhận Nhanh",
["ACTIVITY_OVER_EDSC"] = "Sự kiện đã kết thúc",
["PART_IN_DESC"] = "Tham Gia",
["HERO_FUND_DESCC_1"] = "Mở sự kiện mới Chúc Phúc Ánh Trăng",
["HERO_FUND_DESCC_2"] = "Chúc Phúc Ánh Trăng",
["HERO_FUND_DESCC_3"] = "Sau khi có Chúc Phúc Ánh Trăng, tích lũy số đợt vượt qua khi chiến đấu được nhận quà hậu hĩnh.",
["HERO_FUND_DESCC_4"] = "Mở sự kiện mới Khiêu Chiến Tăng Bậc",
["ARENA_DESC_37"] = "Mở anh hùng:",
["ARENA_DESC_38"] = "Anh hùng đã mở:",
["ARENA_DESC_39"] = "Thưởng Tăng Bậc là phần thưởng một lần",
["ARENA_DESC_40"] = "Thưởng Tăng Bậc",
["ARENA_DESC_41"] = "Thưởng Tổng Kết",
["ARENA_DESC_42"] = "Chưa nhận quà",
["EQUIP_DESC_26"] = "Quà Tăng Ngay Vũ Khí Lv{0}",
["EQUIP_DESC_27"] = "Quà Tăng Ngay Phòng Cụ Lv{0}",
["SEIZED_DESC_1"] = "Đã phát hiện tài khoản có bất thường, vui lòng liên hệ CSKH hoặc xóa TK và sử dụng TK mới để tiếp tục trò chơi.",
["SEIZED_DESC_2"] = "Liên hệ CSKH",
["SEIZED_DESC_3"] = "Xóa TK",
}
return localization_global

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

@ -42,7 +42,7 @@ 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."
},
[3400220]={
["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=#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=#3cff28>1</color> hiệp."
},
[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."

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="Sao Băng Siêu Tốc liên kết <color=#3cff28>4</color> Nguyên Tố trở lên, Sao Băng Siêu Tốc tấn công sẽ thi triển <color=#3cff28>2</color> lần."
},
[3400200]={
["desc"]="Mở khóa Á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"]="Mở khóa Á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>1</color> hiệp."
},
[3400201]={
["desc"]="Ác Mộng Tươi Đẹp theo hướng X được xua tan thêm <color=#3cff28>4</color> ô."
@ -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> ô."
},
[3400204]={
["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>."
["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>, số hiệp <color=#3cff28>+1</color>."
},
[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."

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

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="Ban Đầu"
},
[1400101]={
["value"]="Giáp Di Tích"
},
[14002]={
["value"]="Ban Đầu"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

8
lua/app/config/strings/zh/equip.lua
View File

@ -48,16 +48,16 @@ local equip = {
["name"]="巨力錘,戰者之錘,流星巨錘,破軍錘,斷魂錘,隕星"
},
[1400102]={
["name"]="粗鋼面甲,精鋼面盔,黑曜貴冠,英勇冠冕,龍角之冠,永恆華冠"
["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠"
},
[1400103]={
["name"]="厚織長衫,薄鋼環甲,玄鐵重甲,強者玉甲,龍鱗金冑,永恆重鎧"
["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍"
},
[1400104]={
["name"]="皮革腰帶,烏金束腰,騎士腰環,龍筋束腰,永恆腰鏈,銅製手環"
["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索"
},
[1400105]={
["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪"
["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲"
},
[1400201]={
["name"]="貓拳,尖刺貓拳,青鋼貓拳,裂傷貓拳,破空貓拳,福神之力"

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

@ -447,6 +447,24 @@ local localization_global =
["ACT_DESC_12"] = "LV",
["ARENA_DESC_35"] = "可能出<color=#ff8bf8>史詩</color>哦~",
["ARENA_DESC_36"] = "試試手氣",
["ONE_KEY_GET_DESC"] = "一鍵領取",
["ACTIVITY_OVER_EDSC"] = "活動已結束",
["PART_IN_DESC"] = "參與",
["HERO_FUND_DESCC_1"] = "新活動月之祝福開啟",
["HERO_FUND_DESCC_2"] = "月之祝福",
["HERO_FUND_DESCC_3"] = "擁有月之祝福後，在戰鬥中累積通關波次可獲得豐厚獎勵。",
["HERO_FUND_DESCC_4"] = "新活動進階挑戰開啟",
["ARENA_DESC_37"] = "解鎖英雄：",
["ARENA_DESC_38"] = "已解鎖英雄：",
["ARENA_DESC_39"] = "升段獎勵為一次性獎勵",
["ARENA_DESC_40"] = "升段獎勵",
["ARENA_DESC_41"] = "結算獎勵",
["ARENA_DESC_42"] = "未領取獎勵",
["EQUIP_DESC_26"] = "武器直升{0}級禮包",
["EQUIP_DESC_27"] = "防具直升{0}級禮包",
["SEIZED_DESC_1"] = "檢測到你的賬號存在異常，請聯繫客服或刪除賬號使用新建賬號繼續遊戲。",
["SEIZED_DESC_2"] = "聯繫客服",
["SEIZED_DESC_3"] = "刪除賬號",
}
return localization_global

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

@ -42,7 +42,7 @@ local skill = {
["desc"]="流星追月：使用後本次傷害提高，並造成一次巨大技能傷害。"
},
[3400220]={
["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color>效果，<color=#3cff28>2</color>回合。"
["desc"]="美麗夢魘：額外造成一次大量技能傷害，50%機率附加<color=#3cff28><color=#fcb501><u>昏睡</u></color>效果，<color=#3cff28>1</color>回合。"
},
[4200120]={
["desc"]="元素連接：隨機消除<color=#3cff28>3</color>個元素，並造成一次技能傷害。"

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

@ -468,7 +468,7 @@ local skill_rogue = {
["desc"]="流星追月連接<color=#3cff28>4</color>個元素或以上時，流星追月攻擊將釋放<color=#3cff28>2</color>次。"
},
[3400200]={
["desc"]="解鎖美麗夢魘：額外造成一次大量技能傷害，50%機率附帶<color=#3cff28>昏睡</color>效果，<color=#3cff28>2</color>回合。"
["desc"]="解鎖美麗夢魘：額外造成一次大量技能傷害，50%機率附帶<color=#3cff28>昏睡</color>效果，<color=#3cff28>1</color>回合。"
},
[3400201]={
["desc"]="美麗夢魘沿X方向可額外消除<color=#3cff28>4</color>格。"
@ -480,7 +480,7 @@ local skill_rogue = {
["desc"]="美麗夢魘沿X方向可額外消除<color=#3cff28>4</color>格。"
},
[3400204]={
["desc"]="美麗夢魘附帶的<color=#3cff28>昏睡</color>效果，機率提高到<color=#3cff28>80%</color>。"
["desc"]="美麗夢魘附帶的<color=#3cff28>昏睡</color>效果，機率提高到<color=#3cff28>80%</color>，回合數<color=#3cff28>+1</color>。"
},
[3400205]={
["desc"]="<color=#fcff28>Combo</color>:夢魔普攻<color=#3cff28>昏睡</color>敵人將附帶<color=#3cff28>禁錮</color>效果，<color=#3cff28>2</color>回合。"
@ -579,7 +579,7 @@ local skill_rogue = {
["desc"]="冰霜劍舞附帶的冰霜效果，效果提高。"
},
[4400105]={
["desc"]="冰霜劍舞有<color=#3cff28>50%</color>機率附帶凍傷效果，<color=#3cff28>2</color>回合。"
["desc"]="冰霜劍舞有<color=#3cff28>50%</color>機率附帶凍結效果，<color=#3cff28>2</color>回合。"
},
[4400106]={
["desc"]="寒冰妖姬攻擊提高<color=#3cff28>15%</color>。"

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

@ -11,6 +11,9 @@ local skin = {
[14001]={
["value"]="初始"
},
[1400101]={
["value"]="遺跡戰甲"
},
[14002]={
["value"]="初始"
},
@ -103,6 +106,6 @@ local skin = {
}
}
local config = {
data=skin,count=34
data=skin,count=35
}
return config

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

@ -221,6 +221,7 @@ GConst.ATLAS_PATH = {
UI_DUGEON_ARMOR = "assets/arts/atlas/ui/dungeon_armor.asset",
ACT_SUMMER = "assets/arts/atlas/ui/act_summer.asset",
TASK = "assets/arts/atlas/ui/task.asset",
ACT_HEROFUND = "assets/arts/atlas/ui/act_herofund.asset",
}
GConst.TOUCH_EVENT = {
@ -731,6 +732,7 @@ end
GConst.ERROR_STR = {
SUCCESS = "SUCCESS",
NAME_HAS_EXISTED = "NAME_HAS_EXISTED",
ACCOUNT_BANNED = "ACCOUNT_BANNED",
}
return GConst

5
lua/app/module/account/account_manager.lua
View File

@ -4,8 +4,8 @@ function AccountManager:showBindUI()
UIManager:showUI("app/ui/game_setting/account_binding_ui")
end
function AccountManager:showDeleteUI()
return UIManager:showUI("app/ui/game_setting/account_delete_ui")
function AccountManager:showDeleteUI(hideCloseBtn)
return UIManager:showUI("app/ui/game_setting/account_delete_ui", {hideCloseBtn = hideCloseBtn})
end
function AccountManager:getIsBinded()
@ -28,6 +28,7 @@ function AccountManager:onDeleteAccount(result)
local info = LocalData:getLastLoginInfo()
BIReport:postAccountDelete(info.type)
ModuleManager.LoginManager:goToLoginScene()
LocalData:saveBattleSnapshot({}) -- 清除
else
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DELETE_ACCOUNT_FAILED))
end

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

@ -35,7 +35,7 @@ end
function ActivityManager:initSummerTimer()
self:unscheduleGlobal(self.summerSid)
if DataManager.ActivityData:isInActiveTime() then
if DataManager.ActivityData:isActive() then
Logger.logHighlight("夏日活动结束倒计时："..DataManager.ActivityData:getEndRemainTime())
self.summerSid = self:performWithDelayGlobal(function()
-- 夏日活动结束
@ -54,6 +54,9 @@ end
-- 请求夏日活动数据
function ActivityManager:reqSummerData()
if not DataManager.ActivityData:isOpen() then
return
end
self:sendMessage(ProtoMsgType.FromMsgEnum.SummerDataReq, {}, {}, self.rspSummerData, nil)
end

8
lua/app/module/activity/hero_fund.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 182ed211dd57b7044ae0c6f66592ded7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

51
lua/app/module/activity/hero_fund/hero_fund_manager.lua Normal file
View File

@ -0,0 +1,51 @@
local HeroFundManager = class("HeroFundManager", BaseModule)
function HeroFundManager:showMainUI()
UIManager:showUI("app/ui/activity/hero_fund/hero_fund_ui")
end
function HeroFundManager:reqHeroFundAward(level, rewardType)
if not DataManager.HeroFundData:getIsOpen() then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.ACTIVITY_OVER_EDSC))
return
end
-- 直接一键领取
local curLevel = DataManager.HeroFundData:getWaveLevel()
local heroIdWithLv = {}
for id = 1, curLevel do
if DataManager.HeroFundData:getFreeCanGet(id) then
table.insert(heroIdWithLv, {id = id, grade = 0})
end
if DataManager.HeroFundData:getProCanGet(id) then
table.insert(heroIdWithLv, {id = id, grade = 1})
end
if DataManager.HeroFundData:getUtralCanGet(id) then
table.insert(heroIdWithLv, {id = id, grade = 2})
end
end
if not heroIdWithLv[1] then
return
end
local params = {
id_with_lv = heroIdWithLv
}
self:sendMessage(ProtoMsgType.FromMsgEnum.HeroFundAwardReq, params, {}, self.rspHeroFundAward, BIReport.ITEM_GET_TYPE.ACT_HERO_FUND)
end
function HeroFundManager:rspHeroFundAward(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.HeroFundData:gotReward(result.id_with_lv)
GFunc.showRewardBox(result.rewards)
end
end
function HeroFundManager:purcharse(id)
PayManager:purchasePackage(id, PayManager.PURCHARSE_TYPE.ACT_GIFT)
end
return HeroFundManager

10
lua/app/module/activity/hero_fund/hero_fund_manager.lua.meta Normal file
View File

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

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

@ -21,24 +21,30 @@ function ArenaBountyManager:onClaimReward(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
if result.rewards then
-- 读表获取该层奖励 如果是箱子走单独奖励展示接口
local isOneKeyGet = false
local isSpecialBox = false
local index = result.reqData.level
local isPro = result.reqData.is_pro
local info = DataManager.ArenaBountyData:getSeasonInfoByLevel(index)
local rewardType
local rewardId
if info then
local reward = isPro and info.reward_pro or info.reward
rewardType = reward and reward.type
rewardId = reward and reward.id
if rewardType == GConst.REWARD_TYPE.ITEM then
local itemCfgInfo = ConfigManager:getConfig("item")[rewardId]
if itemCfgInfo and itemCfgInfo.type == GConst.ItemConst.ITEM_TYPE.BOX then
isSpecialBox = true
if index == 0 then -- 一键领取
isOneKeyGet = true
else
local isPro = result.reqData.is_pro
local info = DataManager.ArenaBountyData:getSeasonInfoByLevel(index)
local rewardType
if info then
local reward = isPro and info.reward_pro or info.reward
rewardType = reward and reward.type
rewardId = reward and reward.id
if rewardType == GConst.REWARD_TYPE.ITEM then
local itemCfgInfo = ConfigManager:getConfig("item")[rewardId]
if itemCfgInfo and itemCfgInfo.type == GConst.ItemConst.ITEM_TYPE.BOX then
isSpecialBox = true
end
end
end
end
if isSpecialBox then
if isSpecialBox and not isOneKeyGet then
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)
@ -48,10 +54,15 @@ function ArenaBountyManager:onClaimReward(result)
end
if result.reqData.is_pro ~= nil then
local BountyData = DataManager.ArenaBountyData
if result.reqData.is_pro then
BountyData:onClaimProReward(result.reqData.level)
local index = result.reqData.level
if index ~= 0 then
if result.reqData.is_pro then
BountyData:onClaimProReward(result.reqData.level)
else
BountyData:onClaimReward(result.reqData.level)
end
else
BountyData:onClaimReward(result.reqData.level)
BountyData:onOneKeyClaimReward()
end
BIReport:postArenaBountyReward(BountyData:getBountyReportType(), BountyData:getLevel(), BountyData:getExp(), BountyData:getSeason(), result.reqData.level, result.reqData.is_pro)
end

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

@ -249,4 +249,18 @@ function ArenaManager:showGiftPopUI(showType)
UIManager:showUI("app/ui/arena/arena_pop_gift_ui", {showType = showType})
end
-- 领取段位奖励
function ArenaManager:reqGradingReward(id)
local getIds = {}
table.insert(getIds, id)
self:sendMessage(ProtoMsgType.FromMsgEnum.PVPStageRewardReq, {ids = getIds}, {}, self.rspGradingReward, BIReport.ITEM_GET_TYPE.ARENA_GRADING_REWARD)
end
function ArenaManager:rspGradingReward(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.ArenaData:onGradingRewardReceived(result.reqData.ids)
GFunc.showRewardBox(result.rewards)
end
end
return ArenaManager

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

@ -3,6 +3,7 @@ local BattleHelper = require "app/module/battle/helper/battle_helper"
local BattleBuffHandle = require "app/module/battle/helper/battle_buff_handle"
local BATTLE_BOARD_SKILL_HANDLE = require "app/module/battle/skill/battle_board_skill_handle"
local BATTLE_SKILL_CONDITION_HANDLE = require "app/module/battle/helper/battle_skill_condition_handle"
local BattleFormula = require "app/module/battle/helper/battle_formula"
local BattlePassive = require "app/module/battle/helper/battle_passive"
local BattleUnitComp = class("BattleUnitComp", LuaComponent)
@ -1630,6 +1631,7 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d
end
if num < 0 and atker.unitEntity:getBeDmgToHeal() > 0 then
num = -num * atker.unitEntity:getBeDmgToHeal() // DEFAULT_FACTOR
num = BattleFormula:getAffectedHeal(num, self)
end
atker.unitEntity:addDamageCount(num)
local showHurtCombo = atker:getHurtComboTag()
@ -1761,7 +1763,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus, d
end
function BattleUnitComp:checkDeadStatus(atker, damageOrCureType)
if self.unitEntity:getIsDead() then
if self.unitEntity:getIsDead() and not self.unitEntity:getTagDeadStatus() then
self.unitEntity:tagDeadStatus()
if self.unitEntity:getCanRebirth() then -- 复活
self.battleController:resetTimeSpeed(true)
local mainUnit = self.team:getMainUnit()

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

@ -968,13 +968,13 @@ function BattleBaseController:enterRoundBegin()
self.needWaitingBoardOver = nil
self.waveRoundCount[self.waveIndex] = (self.waveRoundCount[self.waveIndex] or 0) + 1
self.battleUI:enterShowBoardAni(function()
self:takeGridEffect()
self:enterEliminationBegin()
end)
table.clear(self.lastRoundBreakedGridType)
end
function BattleBaseController:takeGridEffect()
local haveGridEffectSucc = false
local gridEntities = self.battleData:getGridEnties()
local effectGrid = {}
for posId, entity in pairs(gridEntities) do
@ -995,6 +995,7 @@ function BattleBaseController:takeGridEffect()
availableEffectTypeMap = {}
end
availableEffectTypeMap[effectType] = true
haveGridEffectSucc = succ
end
end
end
@ -1008,17 +1009,38 @@ function BattleBaseController:takeGridEffect()
availableEffectTypeMap = {}
end
availableEffectTypeMap[effectType] = true
haveGridEffectSucc = succ
end
end
end
return haveGridEffectSucc
end
function BattleBaseController:enterEliminationBegin()
self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_BEGIN
self:enterRefreshBoard(true)
self:enterRefreshBoard(true, function()
local haveGridEffectSucc = self:takeGridEffect()
if haveGridEffectSucc then -- 如果成功，则等待效果播放完成后，进入消除逻辑
if self.haveGridEffectSuccSid then
ModuleManager.BattleManager:unscheduleGlobal(self.haveGridEffectSuccSid)
self.haveGridEffectSuccSid = nil
end
ModuleManager.BattleManager:performWithDelayGlobal(function()
self:enterElimination(true)
end, 1.1)
else
self:enterElimination(true)
end
end)
end
function BattleBaseController:enterElimination(needDelay)
if self.haveGridEffectSuccSid then
ModuleManager.BattleManager:unscheduleGlobal(self.haveGridEffectSuccSid)
self.haveGridEffectSuccSid = nil
end
if self.showSelectSkillSid then
ModuleManager.BattleManager:unscheduleGlobal(self.showSelectSkillSid)
self.showSelectSkillSid = nil
@ -1446,8 +1468,8 @@ function BattleBaseController:dealGridBreak(posId, condition, time, breakedMap,
return
end
cell:setGridTypeIcon(entity:getBreakFlyToCharacterIcon())
self:dealGridEdge(posId)
end
self:dealGridEdge(posId)
end
end
end
@ -1466,6 +1488,7 @@ function BattleBaseController:dealGridEdge(posId)
[BattleConst.BOARD_RANGE_TYPE.RIGHT] = BattleConst.BOARD_RANGE_TYPE.LEFT
}
end
for _, direction in ipairs(self.upDownLeftRightList) do
-- 周围的
local aroundId = ModuleManager.BattleManager:getPosByDirection(posId, direction, self.battleData:getRowCount())
@ -1649,11 +1672,12 @@ function BattleBaseController:onFillBoardOver(isRoundBeginCheck)
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.BOARD_FILL_OVER)
self:popBoardCacheSkill(function()
self:generateSkill(function()
self:enterElimination(true)
if self.onFillBoardOverCallback then
local callback = self.onFillBoardOverCallback
self.onFillBoardOverCallback = nil
callback()
else
self:enterElimination(true)
end
end)
end)

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

@ -14,6 +14,10 @@ function BattleFormula:getDamageOrCureResult(unitComp, buff, targetUnitComp)
return 0
end
function BattleFormula:getAffectedHeal(num, target)
return BattleFormula.calculateFormula[5](num, target)
end
function BattleFormula:getExpectedDamageResult(unitComp, count, targetUnitComp, skillId, atkCompMap)
-- (元素个数*攻击者攻击力+链接技能的伤害) * 受击者伤害减免
-- 普攻
@ -101,6 +105,11 @@ BattleFormula.calculateFormula = {
(DEFAULT_FACTOR + unitComp.unitEntity:getDmgAddition() - unitComp.unitEntity:getDmgDec() + targetUnit.unitEntity:getWeakness(atkMatchType) - targetUnit.unitEntity:getDecDmg(atkMatchType)) // DEFAULT_FACTOR
return result, 0
end,
-- 治疗量 * （治疗效果增减效果）
[5] = function(num, target)
local result = num * (target.unitEntity:getCureAddition() - target.unitEntity:getCureDec() + DEFAULT_FACTOR) // DEFAULT_FACTOR
return result, 0
end
}
return BattleFormula

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

@ -435,7 +435,10 @@ local function _takeAddSkillEnergy(atkUnitComp, skillEntity, battleController)
elementType = boardSkills[math.random(1, count)]
end
local side = battleController:getCurActionSide()
local side = battleController:getCurActionSide()
if atkUnitComp then
side = atkUnitComp:getSide()
end
elementTypeMap = {[elementType] = addEnergy}
battleController:addSkillEnergy(elementTypeMap, side)
battleController.battleUI:refreshSkill(nil, nil, side)

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

@ -21,24 +21,30 @@ function BountyManager:onClaimReward(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
if result.rewards then
-- 读表获取该层奖励 如果是箱子走单独奖励展示接口
local isOneKeyGet = false
local isSpecialBox = false
local index = result.reqData.level
local isPro = result.reqData.is_pro
local info = DataManager.BountyData:getSeasonInfoByLevel(index)
local rewardType
local rewardId
if info then
local reward = isPro and info.reward_pro or info.reward
rewardType = reward and reward.type
rewardId = reward and reward.id
if rewardType == GConst.REWARD_TYPE.ITEM then
local itemCfgInfo = ConfigManager:getConfig("item")[rewardId]
if itemCfgInfo and itemCfgInfo.type == GConst.ItemConst.ITEM_TYPE.BOX then
isSpecialBox = true
if index == 0 then -- 一键领取
isOneKeyGet = true
else
local isPro = result.reqData.is_pro
local info = DataManager.BountyData:getSeasonInfoByLevel(index)
local rewardType
if info then
local reward = isPro and info.reward_pro or info.reward
rewardType = reward and reward.type
rewardId = reward and reward.id
if rewardType == GConst.REWARD_TYPE.ITEM then
local itemCfgInfo = ConfigManager:getConfig("item")[rewardId]
if itemCfgInfo and itemCfgInfo.type == GConst.ItemConst.ITEM_TYPE.BOX then
isSpecialBox = true
end
end
end
end
if isSpecialBox then
if isSpecialBox and not isOneKeyGet then
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)
@ -48,11 +54,17 @@ function BountyManager:onClaimReward(result)
end
if result.reqData.is_pro ~= nil then
local BountyData = DataManager.BountyData
if result.reqData.is_pro then
BountyData:onClaimProReward(result.reqData.level)
local index = result.reqData.level
if index ~= 0 then
if result.reqData.is_pro then
BountyData:onClaimProReward(result.reqData.level)
else
BountyData:onClaimReward(result.reqData.level)
end
else
BountyData:onClaimReward(result.reqData.level)
BountyData:onOneKeyClaimReward()
end
BIReport:postBountyReward(BountyData:getBountyReportType(), BountyData:getLevel(), BountyData:getExp(), BountyData:getSeason(), result.reqData.level, result.reqData.is_pro)
end
end

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

@ -1,5 +1,40 @@
local EquipManager = class("EquipManager", BaseModule)
-- 展示材料获取弹窗(英雄id，部位，材料id，材料数量)
function EquipManager:showItemGetPop(heroId, part, id, num)
self:reqEquipUpgradeGift(heroId, part)
UIManager:showUI("app/ui/dungeon/item_get_ui", {heroId = heroId, part = part, id = id, value = num})
end
-- 检查装备礼包状态定时器
function EquipManager:updateEquipGiftTimer(isClear)
self:unscheduleAll()
if not isClear then
local time = DataManager.EquipData:getGiftNearestRemainTime()
if time and time > 0 then
Logger.logHighlight("设置装备礼包倒计时:"..time)
self.giftSid = self:performWithDelayGlobal(function()
DataManager.EquipData:onGiftStateChange()
end, time)
end
end
end
-- 请求触发装备升级礼包
function EquipManager:reqEquipUpgradeGift(heroId, part)
if DataManager.EquipData:getCanShowGiftId(heroId, part) ~= nil then
return
end
self:sendMessage(ProtoMsgType.FromMsgEnum.TriggerWeaponArmorGiftReq, {hero_id = heroId, equip_position = part}, {}, self.rspEquipUpgradeGift, nil)
end
function EquipManager:rspEquipUpgradeGift(result)
DataManager.EquipData:initGifts(result.info)
end
-- 升级装备
function EquipManager:reqUpgrade(id, part)
local entity = DataManager.EquipData:getEquip(id, part)
@ -15,7 +50,7 @@ function EquipManager:reqUpgrade(id, part)
for index, cost in ipairs(entity:getUpgradeMaterials()) do
if cost.num > DataManager.BagData.ItemData:getItemNumById(cost.id) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_8))
UIManager:showUI("app/ui/dungeon/item_get_ui", {id = cost.id, value = cost.num})
self:showItemGetPop(id, part, cost.id, cost.num)
return
end
end

8
lua/app/module/gm/dev_tool_manager.lua
View File

@ -88,4 +88,12 @@ function DevToolManager:onDealGMFinish(parmas, code, result)
ModuleManager.LoginManager:goToLoginScene()
end
function DevToolManager:setSkip(skip)
self.isSkipTutorial = skip
end
function DevToolManager:getSkip()
return self.isSkipTutorial
end
return DevToolManager

4
lua/app/module/hero/hero_manager.lua
View File

@ -1,7 +1,7 @@
local HeroManager = class("HeroManager", BaseModule)
function HeroManager:showHeroDetailUI(heroId, onlyLook, heroEntity, skinId)
UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId, onlyLook = onlyLook, heroEntity = heroEntity, skinId = skinId})
function HeroManager:showHeroDetailUI(heroId, onlyLook, heroEntity, skinId, formationType)
UIManager:showUI("app/ui/hero/hero_detail_ui", {heroId = heroId, onlyLook = onlyLook, heroEntity = heroEntity, skinId = skinId, formationType = formationType})
end
function HeroManager:showHeroUnlockUI(heroIdList)

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

@ -181,8 +181,24 @@ function LoginManager:loginFinish(data)
BIReport:postLvEvent(0, 1)
end
else
DataManager:setLoginSuccess(false)
local info = LocalData:getLastLoginInfo()
BIReport:postAccountLoginFailed(info.type, data.err_code)
if data.err_code == GConst.ERROR_STR.ACCOUNT_BANNED then -- 封号
local params = {
content = I18N:getGlobalText(I18N.GlobalConst.SEIZED_DESC_1),
boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL,
okText = I18N:getGlobalText(I18N.GlobalConst.SEIZED_DESC_2),
okFunc = function()
ModuleManager.GameSettingManager:showSupport()
end,
cancelText = I18N:getGlobalText(I18N.GlobalConst.SEIZED_DESC_3),
cancelFunc = function()
ModuleManager.AccountManager:showDeleteUI(true)
end
}
GFunc.showMessageBox(params)
end
end
end
@ -198,40 +214,40 @@ function LoginManager:saveAuthArgs(isReconnect, name)
args.client_info = self:getClientInfo()
args.reconnect = isReconnect
local sendQueue = LocalData:getSendQueue()
-- local sendQueue = LocalData:getSendQueue()
args.sync =
{
pip = GFunc.getArray()
}
if sendQueue and sendQueue[1] then
local ProtoMsgDispatch = require "app/proto/proto_msg_dispatch"
local pb = require "pb"
for _, info in ipairs(sendQueue) do
local curParams = info.params
local needAd = false
if info.msgName == ProtoMsgType.FromMsgEnum.PipedReq then
local msgName = ProtoMsgDispatch:getReqMsgNameByMsgId(curParams.msg_id)
if msgName then
local fullMsgName = ProtoMsgDispatch:getMsgFullNameByMsgName(msgName)
if fullMsgName then
if curParams.data and type(curParams.data) == "table" then
local ok, pbData = pcall(function()
return pb.encode(fullMsgName, curParams.data)
end)
if ok then
needAd = true
curParams.data = pbData
end
end
end
end
end
if needAd then
table.insert(args.sync.pip, curParams)
end
end
end
-- if sendQueue and sendQueue[1] then
-- local ProtoMsgDispatch = require "app/proto/proto_msg_dispatch"
-- local pb = require "pb"
-- for _, info in ipairs(sendQueue) do
-- local curParams = info.params
-- local needAd = false
-- if info.msgName == ProtoMsgType.FromMsgEnum.PipedReq then
-- local msgName = ProtoMsgDispatch:getReqMsgNameByMsgId(curParams.msg_id)
-- if msgName then
-- local fullMsgName = ProtoMsgDispatch:getMsgFullNameByMsgName(msgName)
-- if fullMsgName then
-- if curParams.data and type(curParams.data) == "table" then
-- local ok, pbData = pcall(function()
-- return pb.encode(fullMsgName, curParams.data)
-- end)
-- if ok then
-- needAd = true
-- curParams.data = pbData
-- end
-- end
-- end
-- end
-- end
-- if needAd then
-- table.insert(args.sync.pip, curParams)
-- end
-- end
-- end
NetManager:saveAuthArgs(args)
end

1
lua/app/module/maincity/maincity_const.lua
View File

@ -30,6 +30,7 @@ MainCityConst.MAIN_MODULE = {
MainCityConst.LEFT_SIDE_BARS = {
"app/ui/main_city/cell/side_bar_idle_cell",
"app/ui/main_city/cell/side_bar_growth_fund_cell",
"app/ui/main_city/cell/side_bar_hero_fund_cell",
"app/ui/main_city/cell/side_bar_seven_days_cell",
"app/ui/main_city/cell/side_bar_activity_cell",
-- gm放最后一个

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