Merge branch 'fang/皮肤' into 'dev_20230815'

皮肤功能

See merge request b6-client/b6-lua!10
This commit is contained in:
陈希 2023-08-09 07:28:08 +00:00
commit 8f37945b1e
112 changed files with 15820 additions and 859 deletions

View File

@ -15,6 +15,7 @@ function DataManager:init()
self:initManager("HeroData", "app/userdata/hero/hero_data") self:initManager("HeroData", "app/userdata/hero/hero_data")
self:initManager("BagData", "app/userdata/bag/bag_data") self:initManager("BagData", "app/userdata/bag/bag_data")
self:initManager("EquipData", "app/userdata/equip/equip_data") self:initManager("EquipData", "app/userdata/equip/equip_data")
self:initManager("SkinData", "app/userdata/skin/skin_data")
self:initManager("BattleData", "app/userdata/battle/battle_data") self:initManager("BattleData", "app/userdata/battle/battle_data")
self:initManager("BattlePVPData", "app/userdata/battle/battle_pvp_data") self:initManager("BattlePVPData", "app/userdata/battle/battle_pvp_data")
self:initManager("FormationData", "app/userdata/formation/formation_data") self:initManager("FormationData", "app/userdata/formation/formation_data")
@ -100,6 +101,7 @@ function DataManager:clear()
self.HeroData:clear() self.HeroData:clear()
self.BagData:clear() self.BagData:clear()
self.EquipData:clear() self.EquipData:clear()
self.SkinData:clear()
self.FormationData:clear() self.FormationData:clear()
self.ActivityData:clear() self.ActivityData:clear()
self.MailData:clear() self.MailData:clear()
@ -138,7 +140,8 @@ function DataManager:initWithServerData(data)
self.DungeonData:initDungeonGold(data.chapter_gold_challenge) self.DungeonData:initDungeonGold(data.chapter_gold_challenge)
self.DungeonData:initDungeonShards(data.chapter_shards_challenge) self.DungeonData:initDungeonShards(data.chapter_shards_challenge)
self.EquipData:init(data.heroes_equips) self.EquipData:init(data.heroes_equips)
-- HeroData要在EquipData之后初始化依赖装备的属性数据 self.SkinData:init(data.bag.skins)
-- HeroData要在EquipData和SkinData之后初始化依赖它们的属性数据
self.HeroData:init(data.bag.heroes) self.HeroData:init(data.bag.heroes)
self.BagData:init(data.bag) self.BagData:init(data.bag)
self.FormationData:init(data.fight_info) self.FormationData:init(data.fight_info)

View File

@ -54,6 +54,8 @@ EventManager.CUSTOM_EVENT = {
EQUIP_UPSECTION_SUCCESS = "EQUIP_UPSECTION_SUCCESS", EQUIP_UPSECTION_SUCCESS = "EQUIP_UPSECTION_SUCCESS",
HERO_UPGRADE_SUCCESS = "HERO_UPGRADE_SUCCESS", HERO_UPGRADE_SUCCESS = "HERO_UPGRADE_SUCCESS",
GO_DUNGEON_UI = "GO_DUNGEON_UI", GO_DUNGEON_UI = "GO_DUNGEON_UI",
-- 皮肤
SKIN_SELECT = "SKIN_SELECT",
-- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN",
-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"
DUNGEON_ARMOR_TO_TARGET_ID = "DUNGEON_ARMOR_TO_TARGET_ID", DUNGEON_ARMOR_TO_TARGET_ID = "DUNGEON_ARMOR_TO_TARGET_ID",

View File

@ -67,6 +67,8 @@ local MODULE_PATHS = {
DungeonArmorManager = "app/module/dungeon_armor/dungeon_armor_manager", DungeonArmorManager = "app/module/dungeon_armor/dungeon_armor_manager",
-- 装备 -- 装备
EquipManager = "app/module/equip/equip_manager", EquipManager = "app/module/equip/equip_manager",
-- 皮肤
SkinManager = "app/module/skin/skin_manager",
} }
-- 这里的key对应func_open里的id -- 这里的key对应func_open里的id
@ -96,6 +98,7 @@ ModuleManager.MODULE_KEY = {
DUNGEON_WEAPON = "dungeon_weapon_open", -- 装备副本 DUNGEON_WEAPON = "dungeon_weapon_open", -- 装备副本
EQUIP_WEAPON = "equip_weapon_open", -- 武器 EQUIP_WEAPON = "equip_weapon_open", -- 武器
EQUIP_ARMOR = "equip_armor_open", -- 防具 EQUIP_ARMOR = "equip_armor_open", -- 防具
SKIN = "skin_open", -- 皮肤
} }
local _moduleMgrs = {} local _moduleMgrs = {}
@ -119,6 +122,7 @@ function ModuleManager:init()
ModuleManager.TaskManager:init() ModuleManager.TaskManager:init()
ModuleManager.DailyChallengeManager:init() ModuleManager.DailyChallengeManager:init()
ModuleManager.PlayerManager:init() ModuleManager.PlayerManager:init()
ModuleManager.SkinManager:init()
end end
-- 功能是否开启 -- 功能是否开启

View File

@ -7386,7 +7386,7 @@ local chapter = {
["before_chapter"]=35, ["before_chapter"]=35,
["next_chapter"]=37, ["next_chapter"]=37,
["icon"]="chapter_31", ["icon"]="chapter_31",
["scene"]="bg_26", ["scene"]="bg_31",
["block_icon"]="battle_hinder_26", ["block_icon"]="battle_hinder_26",
["chess_board"]="chessboard_1", ["chess_board"]="chessboard_1",
["board"]={ ["board"]={
@ -7605,7 +7605,7 @@ local chapter = {
["before_chapter"]=36, ["before_chapter"]=36,
["next_chapter"]=38, ["next_chapter"]=38,
["icon"]="chapter_32", ["icon"]="chapter_32",
["scene"]="bg_27", ["scene"]="bg_32",
["block_icon"]="battle_hinder_27", ["block_icon"]="battle_hinder_27",
["chess_board"]="chessboard_1", ["chess_board"]="chessboard_1",
["board"]={ ["board"]={
@ -7824,7 +7824,7 @@ local chapter = {
["before_chapter"]=37, ["before_chapter"]=37,
["next_chapter"]=39, ["next_chapter"]=39,
["icon"]="chapter_33", ["icon"]="chapter_33",
["scene"]="bg_28", ["scene"]="bg_33",
["block_icon"]="battle_hinder_28", ["block_icon"]="battle_hinder_28",
["chess_board"]="chessboard_1", ["chess_board"]="chessboard_1",
["board"]={ ["board"]={
@ -8043,7 +8043,7 @@ local chapter = {
["before_chapter"]=38, ["before_chapter"]=38,
["next_chapter"]=40, ["next_chapter"]=40,
["icon"]="chapter_34", ["icon"]="chapter_34",
["scene"]="bg_29", ["scene"]="bg_34",
["block_icon"]="battle_hinder_30", ["block_icon"]="battle_hinder_30",
["chess_board"]="chessboard_3", ["chess_board"]="chessboard_3",
["board"]={ ["board"]={
@ -8261,7 +8261,7 @@ local chapter = {
[40]={ [40]={
["before_chapter"]=39, ["before_chapter"]=39,
["icon"]="chapter_35", ["icon"]="chapter_35",
["scene"]="bg_30", ["scene"]="bg_35",
["block_icon"]="battle_hinder_29", ["block_icon"]="battle_hinder_29",
["chess_board"]="chessboard_3", ["chess_board"]="chessboard_3",
["board"]={ ["board"]={

File diff suppressed because it is too large Load Diff

View File

@ -365,7 +365,8 @@ local hero = {
31780000, 31780000,
36060000 36060000
}, },
["model_id"]="p0018", ["model_id"]="p0028",
["icon"]="31",
["item_id"]=14003, ["item_id"]=14003,
["collection_point"]=5, ["collection_point"]=5,
["skin"]={ ["skin"]={
@ -737,8 +738,10 @@ local hero = {
31780000, 31780000,
36060000 36060000
}, },
["model_id"]="p0018", ["model_id"]="p0031",
["icon"]="27",
["item_id"]=24003, ["item_id"]=24003,
["unlock_arena"]=10,
["collection_point"]=5, ["collection_point"]=5,
["skin"]={ ["skin"]={
24003 24003
@ -1111,7 +1114,7 @@ local hero = {
36060000 36060000
}, },
["model_id"]="p0027", ["model_id"]="p0027",
["icon"]="24", ["icon"]="28",
["item_id"]=34002, ["item_id"]=34002,
["unlock_arena"]=6, ["unlock_arena"]=6,
["is_show"]=1, ["is_show"]=1,
@ -1488,7 +1491,7 @@ local hero = {
36060000 36060000
}, },
["model_id"]="p0030", ["model_id"]="p0030",
["icon"]="24", ["icon"]="29",
["item_id"]=44003, ["item_id"]=44003,
["collection_point"]=5, ["collection_point"]=5,
["skin"]={ ["skin"]={
@ -1863,9 +1866,10 @@ local hero = {
31780000, 31780000,
36060000 36060000
}, },
["model_id"]="p0030", ["model_id"]="p0029",
["icon"]="24", ["icon"]="30",
["item_id"]=54003, ["item_id"]=54003,
["unlock_arena"]=3,
["collection_point"]=5, ["collection_point"]=5,
["skin"]={ ["skin"]={
54003 54003

View File

@ -1374,7 +1374,7 @@ local skill = {
["effect"]={ ["effect"]={
{ {
["type"]="hurt_red", ["type"]="hurt_red",
["num"]=60000, ["num"]=80000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
} }
@ -1413,82 +1413,19 @@ local skill = {
}, },
[1400222]={ [1400222]={
["position"]=1, ["position"]=1,
["buff_condition"]={
{
{
["type"]="state",
["attr"]="frozen",
["op"]=">",
["v"]=0,
["side"]=2
}
}
},
["condition_rel"]={
{
1,
1
}
},
["combo_position"]=1,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=7, ["trigger"]=6,
["effect"]={ ["effect"]={
{ {
["type"]="dmg_addition_red_add", ["type"]="normal_attack_add",
["num"]=5000, ["num"]=2,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=3
} }
}, },
["obj"]=1 ["obj"]=1
}, },
[1400223]={ [1400223]={
["energy"]=10,
["link"]=1,
["position"]=1,
["method"]=2,
["skill_type"]=4,
["boardrange"]={
{
["type"]=3,
["range"]=2
},
{
["type"]=4,
["range"]=2
}
},
["battle_icon"]="21",
["effect_type"]=1,
["trigger"]=1,
["effect"]={
{
["type"]="hurt_red",
["num"]=60000,
["ratio"]=10000,
["round"]=0
}
},
["obj"]=2,
["skill_position"]={
1,
100
},
["shake_time"]=200,
["shake_type"]=6,
["sound"]=14002200,
["sound_delay"]=0.0,
["name_act"]="skill01",
["fx_self"]=300104,
["bullet_time"]={
1466,
3000,
400
},
["fx_self_mirror"]=400104
},
[1400224]={
["position"]=1, ["position"]=1,
["effect_type"]=2, ["effect_type"]=2,
["trigger"]=5, ["trigger"]=5,
@ -1502,37 +1439,6 @@ local skill = {
}, },
["obj"]=2 ["obj"]=2
}, },
[1400225]={
["position"]=1,
["buff_condition"]={
{
{
["type"]="state",
["attr"]="frozen",
["op"]=">",
["v"]=0,
["side"]=2
}
}
},
["condition_rel"]={
{
1,
1
}
},
["effect_type"]=2,
["trigger"]=6,
["effect"]={
{
["type"]="normal_attack_add",
["num"]=2,
["ratio"]=10000,
["round"]=3
}
},
["obj"]=1
},
[1400310]={ [1400310]={
["position"]=1, ["position"]=1,
["effect_type"]=1, ["effect_type"]=1,
@ -1643,13 +1549,31 @@ local skill = {
["position"]=1, ["position"]=1,
["method"]=1, ["method"]=1,
["skill_type"]=0, ["skill_type"]=0,
["battle_icon"]="21", ["battle_icon"]="30",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
{ {
["type"]="hurt_red", ["type"]="hurt_red",
["num"]=40000, ["num"]=8000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_red",
["num"]=9000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_red",
["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_red",
["num"]=13000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
}, },
@ -1661,6 +1585,12 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["effect_block"]={
1,
2,
3,
5
},
["skill_position"]={ ["skill_position"]={
1, 1,
100 100
@ -3253,13 +3183,19 @@ local skill = {
["boardrange"]={ ["boardrange"]={
}, },
["battle_icon"]="22", ["battle_icon"]="26",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
{ {
["type"]="hurt_yellow", ["type"]="hurt_yellow",
["num"]=40000, ["num"]=10000,
["ratio"]=10000,
["round"]=0
},
{
["type"]="hurt_yellow",
["num"]=30000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=0 ["round"]=0
}, },
@ -3271,6 +3207,10 @@ local skill = {
} }
}, },
["obj"]=2, ["obj"]=2,
["effect_block"]={
1,
3
},
["skill_position"]={ ["skill_position"]={
1, 1,
100 100
@ -4857,7 +4797,7 @@ local skill = {
["range"]=3 ["range"]=3
} }
}, },
["battle_icon"]="23", ["battle_icon"]="27",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
@ -4934,7 +4874,7 @@ local skill = {
{ {
["type"]="bleed", ["type"]="bleed",
["num"]=3500, ["num"]=3500,
["ratio"]=10000, ["ratio"]=1000,
["round"]=2 ["round"]=2
} }
}, },
@ -6338,7 +6278,7 @@ local skill = {
["position"]=4, ["position"]=4,
["method"]=1, ["method"]=1,
["skill_type"]=0, ["skill_type"]=0,
["battle_icon"]="24", ["battle_icon"]="28",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
@ -7883,7 +7823,7 @@ local skill = {
["skill_type_parameter"]={ ["skill_type_parameter"]={
}, },
["battle_icon"]="25", ["battle_icon"]="29",
["effect_type"]=1, ["effect_type"]=1,
["trigger"]=1, ["trigger"]=1,
["effect"]={ ["effect"]={
@ -7897,7 +7837,7 @@ local skill = {
["type"]="corrupt", ["type"]="corrupt",
["num"]=5000, ["num"]=5000,
["ratio"]=10000, ["ratio"]=10000,
["round"]=2 ["round"]=1
} }
}, },
["obj"]=2, ["obj"]=2,
@ -25694,6 +25634,6 @@ local skill = {
} }
} }
local config = { local config = {
data=skill,count=930 data=skill,count=928
} }
return config return config

View File

@ -1233,7 +1233,7 @@ local skill_rogue = {
[1400202]={ [1400202]={
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=4,
["type"]=12, ["type"]=12,
["skill_position"]=1, ["skill_position"]=1,
["effect"]={ ["effect"]={
@ -1248,14 +1248,22 @@ local skill_rogue = {
["icon"]="197" ["icon"]="197"
}, },
[1400203]={ [1400203]={
["method"]=2,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=3, ["qlt"]=3,
["type"]=1, ["type"]=2,
["parameter"]={
1400223
},
["skill_position"]=1, ["skill_position"]=1,
["boardrange"]={
{
["type"]=3,
["range"]=2
},
{
["type"]=4,
["range"]=2
}
},
["icon"]="198" ["icon"]="198"
}, },
[1400204]={ [1400204]={
@ -1267,7 +1275,7 @@ local skill_rogue = {
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="add_skill",
["num"]=1400224, ["num"]=1400223,
["ratio"]=10000, ["ratio"]=10000,
["round"]=999 ["round"]=999
} }
@ -1279,12 +1287,15 @@ local skill_rogue = {
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,
["type"]=12, ["type"]=14,
["parameter"]={
6
},
["skill_position"]=1, ["skill_position"]=1,
["effect"]={ ["effect"]={
{ {
["type"]="add_skill", ["type"]="skill_fire_times",
["num"]=1400225, ["num"]=1400220,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
} }
@ -1310,13 +1321,12 @@ local skill_rogue = {
["icon"]="201" ["icon"]="201"
}, },
[1400207]={ [1400207]={
["unlock"]=1400205,
["cover_unlock"]=1400205,
["limit_times"]=1, ["limit_times"]=1,
["weight"]=3000, ["weight"]=3000,
["qlt"]=4, ["qlt"]=4,
["type"]=14, ["type"]=12,
["parameter"]={
6
},
["skill_position"]=1, ["skill_position"]=1,
["effect"]={ ["effect"]={
{ {
@ -1324,12 +1334,6 @@ local skill_rogue = {
["num"]=1400220, ["num"]=1400220,
["ratio"]=10000, ["ratio"]=10000,
["round"]=1 ["round"]=1
},
{
["type"]="skill_fire_times",
["num"]=1400223,
["ratio"]=10000,
["round"]=1
} }
}, },
["obj"]=3, ["obj"]=3,
@ -1383,7 +1387,7 @@ local skill_rogue = {
["qlt"]=3, ["qlt"]=3,
["type"]=7, ["type"]=7,
["parameter"]={ ["parameter"]={
2, 5,
1000 1000
}, },
["skill_position"]=1, ["skill_position"]=1,
@ -2153,7 +2157,7 @@ local skill_rogue = {
["qlt"]=4, ["qlt"]=4,
["type"]=8, ["type"]=8,
["parameter"]={ ["parameter"]={
2, 3,
1 1
}, },
["skill_position"]=2, ["skill_position"]=2,
@ -2908,6 +2912,7 @@ local skill_rogue = {
["round"]=1 ["round"]=1
} }
}, },
["obj"]=5,
["icon"]="210" ["icon"]="210"
}, },
[3400302]={ [3400302]={
@ -2935,6 +2940,7 @@ local skill_rogue = {
["round"]=999 ["round"]=999
} }
}, },
["obj"]=5,
["icon"]="212" ["icon"]="212"
}, },
[3400304]={ [3400304]={
@ -2951,6 +2957,7 @@ local skill_rogue = {
["round"]=1 ["round"]=1
} }
}, },
["obj"]=1,
["icon"]="213" ["icon"]="213"
}, },
[3400305]={ [3400305]={
@ -2967,6 +2974,7 @@ local skill_rogue = {
["round"]=1 ["round"]=1
} }
}, },
["obj"]=5,
["icon"]="214" ["icon"]="214"
}, },
[3400306]={ [3400306]={
@ -2999,6 +3007,7 @@ local skill_rogue = {
["round"]=1 ["round"]=1
} }
}, },
["obj"]=5,
["icon"]="216" ["icon"]="216"
}, },
[4200100]={ [4200100]={

View File

@ -47,6 +47,7 @@ local skin = {
["item_id"]=1400201 ["item_id"]=1400201
}, },
[14003]={ [14003]={
["model_id"]="p0028",
["qlt"]=1, ["qlt"]=1,
["skin_point"]=0, ["skin_point"]=0,
["hero_id"]=14003 ["hero_id"]=14003
@ -82,6 +83,7 @@ local skin = {
["hero_id"]=24002 ["hero_id"]=24002
}, },
[24003]={ [24003]={
["model_id"]="p0031",
["qlt"]=1, ["qlt"]=1,
["skin_point"]=0, ["skin_point"]=0,
["hero_id"]=24003 ["hero_id"]=24003
@ -134,6 +136,7 @@ local skin = {
["hero_id"]=34002 ["hero_id"]=34002
}, },
[34003]={ [34003]={
["model_id"]="p0027",
["qlt"]=1, ["qlt"]=1,
["skin_point"]=0, ["skin_point"]=0,
["hero_id"]=34003 ["hero_id"]=34003
@ -191,11 +194,11 @@ local skin = {
["bonus"]={ ["bonus"]={
{ {
["type"]="atk_purple", ["type"]="atk_purple",
["num"]=1000000 ["num"]=300000
}, },
{ {
["type"]="attr_hpp_purple", ["type"]="attr_hpp_purple",
["num"]=2000000 ["num"]=700000
} }
}, },
["got"]=1, ["got"]=1,
@ -239,6 +242,7 @@ local skin = {
["hero_id"]=54002 ["hero_id"]=54002
}, },
[54003]={ [54003]={
["model_id"]="p0029",
["qlt"]=1, ["qlt"]=1,
["skin_point"]=0, ["skin_point"]=0,
["hero_id"]=54003 ["hero_id"]=54003

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35.潜艇控制室" ["name"]="35.潜艇控制室"
},
[36]={
["name"]="36.海底通道(上)"
},
[37]={
["name"]="37.海底通道(下)"
},
[38]={
["name"]="38.海底峡谷"
},
[39]={
["name"]="39.海底遗迹"
},
[40]={
["name"]="40.海底城堡"
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" ["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
}, },
[1400301]={
["name"]="猫拳,尖刺猫拳,青钢猫拳,裂伤猫拳,破空猫拳,福神之力"
},
[1400302]={
["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
},
[1400303]={
["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠"
},
[1400304]={
["name"]="皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链,铜制手环"
},
[1400305]={
["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
},
[2200101]={ [2200101]={
["name"]="弯刀,狼牙弯刀,飞虹刀,断瀑刀,屠魔刀,斩龙刀" ["name"]="弯刀,狼牙弯刀,飞虹刀,断瀑刀,屠魔刀,斩龙刀"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" ["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
}, },
[2400301]={
["name"]="雷锤,闪电雷锤,震荡雷锤,震天雷锤,罚罪雷锤,掣电雷锤"
},
[2400302]={
["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠"
},
[2400303]={
["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠"
},
[2400304]={
["name"]="皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链,铜制手环"
},
[2400305]={
["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮"
},
[3200101]={ [3200101]={
["name"]="长枪,强力长枪,破甲长枪,不屈长枪,狂风之枪,巨人风暴" ["name"]="长枪,强力长枪,破甲长枪,不屈长枪,狂风之枪,巨人风暴"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲"
}, },
[3400301]={
["name"]="魅心,展颜,玲珑,眸若碧波,灿若繁星,日月失辉"
},
[3400302]={
["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠"
},
[3400303]={
["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍"
},
[3400304]={
["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索"
},
[3400305]={
["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲"
},
[4200101]={ [4200101]={
["name"]="魔杖,精致魔杖,水晶魔杖,寒冰魔杖,霜星魔杖,雪域冰天" ["name"]="魔杖,精致魔杖,水晶魔杖,寒冰魔杖,霜星魔杖,雪域冰天"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲"
}, },
[4400301]={
["name"]="法球,蒙尘法球,黯光法球,符文法球,诅咒法球,法老之心"
},
[4400302]={
["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠"
},
[4400303]={
["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍"
},
[4400304]={
["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索"
},
[4400305]={
["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲"
},
[5200101]={ [5200101]={
["name"]="手里剑,大型手里剑,机关手里剑,疾风手里剑,幽灵手里剑,追影" ["name"]="手里剑,大型手里剑,机关手里剑,疾风手里剑,幽灵手里剑,追影"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲"
},
[5400301]={
["name"]="环刃,蛇形环,月牙环,断肠环,离魂环,月痕"
},
[5400302]={
["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠"
},
[5400303]={
["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍"
},
[5400304]={
["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索"
},
[5400305]={
["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -19,6 +19,10 @@ local hero = {
["name"]="潘达", ["name"]="潘达",
["desc"]="潘达厉害的可不止爪子,还有鞭炮。" ["desc"]="潘达厉害的可不止爪子,还有鞭炮。"
}, },
[14003]={
["name"]="皮侍",
["desc"]="像闪电一样,不停地攻击!!!!"
},
[22001]={ [22001]={
["name"]="刀妹", ["name"]="刀妹",
["desc"]="剑一出鞘,必要见血。" ["desc"]="剑一出鞘,必要见血。"
@ -39,6 +43,10 @@ local hero = {
["name"]="索尔", ["name"]="索尔",
["desc"]="想试试雷神之锤的威力吗。" ["desc"]="想试试雷神之锤的威力吗。"
}, },
[24003]={
["name"]="善意",
["desc"]="手中的太刀如龙飞舞那是无与伦比的剑术。"
},
[32001]={ [32001]={
["name"]="洋葱头", ["name"]="洋葱头",
["desc"]="盾牌只是为了掩饰下一次突刺。" ["desc"]="盾牌只是为了掩饰下一次突刺。"
@ -59,6 +67,10 @@ local hero = {
["name"]="梦魔", ["name"]="梦魔",
["desc"]="来找点乐子吧!" ["desc"]="来找点乐子吧!"
}, },
[34003]={
["name"]="忍者菲尔",
["desc"]="迅猛如风,保护水之王国免受邪恶势力的侵害。"
},
[42001]={ [42001]={
["name"]="冰心", ["name"]="冰心",
["desc"]="我的心和我的法术一样冰冷。" ["desc"]="我的心和我的法术一样冰冷。"
@ -79,6 +91,10 @@ local hero = {
["name"]="艳后", ["name"]="艳后",
["desc"]="美丽也是一种武器。" ["desc"]="美丽也是一种武器。"
}, },
[44003]={
["name"]="月之法师",
["desc"]="在她的月轮双刃下,夜晚的星辰在她的指尖舞动,魔法的月光照亮了她无限的智慧~"
},
[52001]={ [52001]={
["name"]="忍者伦", ["name"]="忍者伦",
["desc"]="虽然带的是手里剑,但是最擅长的还是护盾术,忍者伦最大的愿望还是世界和平。" ["desc"]="虽然带的是手里剑,但是最擅长的还是护盾术,忍者伦最大的愿望还是世界和平。"
@ -98,9 +114,13 @@ local hero = {
[54002]={ [54002]={
["name"]="闪烁法师", ["name"]="闪烁法师",
["desc"]="邪恶在此终结。" ["desc"]="邪恶在此终结。"
},
[54003]={
["name"]="堕落骑士",
["desc"]="曾经王国中最杰出的骑士之一,命运使他堕落成为一名诅咒巨剑的使用者。"
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="幻影连击:额外造成多次技能伤害。" ["desc"]="幻影连击:额外造成多次技能伤害。"
},
[1400320]={
["desc"]="炼狱扳机:额外造成多次技能伤害,附加<color=#3cff28><u>易伤</u></color>效果,<color=#3cff28>2</color>回合。"
},
[2400320]={
["desc"]="神速一闪:额外造成多次技能伤害,<color=#3cff28>50%</color>概率附加<color=#3cff28><u>眩晕</u></color>效果,<color=#3cff28>1</color>回合。"
},
[3400320]={
["desc"]="绝命啃咬:额外造成多次技能伤害,并随机消除<color=#3cff28>3</color>个元素。"
},
[4400320]={
["desc"]="旋转月轮:额外造成多次技能伤害,<color=#3cff28>50%</color>概率附加<color=#3cff28><u>冻结</u></color></color>效果,<color=#3cff28>1</color>回合。"
},
[5400320]={
["desc"]="堕落之剑:额外造成一次大量技能伤害,附加<color=#3cff28><u>腐败</u></color>效果,<color=#3cff28>1</color>回合。"
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -228,13 +228,13 @@ local skill_rogue = {
["desc"]="钢铁重击每连接<color=#3cff28>4</color>个元素则额外发射1个火球造成伤害。" ["desc"]="钢铁重击每连接<color=#3cff28>4</color>个元素则额外发射1个火球造成伤害。"
}, },
[1400200]={ [1400200]={
["desc"]="解锁熊猫爆竹:额外造成一次量技能伤害。" ["desc"]="解锁熊猫爆竹:额外造成一次量技能伤害。"
}, },
[1400201]={ [1400201]={
["desc"]="熊猫爆竹可附加灼烧效果,<color=#3cff28>2</color>回合。" ["desc"]="熊猫爆竹可附加<color=#3cff28>灼烧</color>效果,<color=#3cff28>2</color>回合。"
}, },
[1400202]={ [1400202]={
["desc"]="<color=#fcff28>Combo</color>:熊猫爆竹对<color=#3cff28>冻结</color>敌人的伤害增加<color=#3cff28>50%</color>" ["desc"]="熊猫爆竹可为团队附加<color=#3cff28>亢奋</color>效果,<color=#3cff28>3</color>回合"
}, },
[1400203]={ [1400203]={
["desc"]="熊猫爆竹横向可额外消除<color=#3cff28>4</color>个格。" ["desc"]="熊猫爆竹横向可额外消除<color=#3cff28>4</color>个格。"
@ -243,13 +243,13 @@ local skill_rogue = {
["desc"]="潘达普攻时有<color=#3cff28>10%</color>概率附加灼烧效果,<color=#3cff28>2</color>回合。" ["desc"]="潘达普攻时有<color=#3cff28>10%</color>概率附加灼烧效果,<color=#3cff28>2</color>回合。"
}, },
[1400205]={ [1400205]={
["desc"]="<color=#fcff28>Combo</color>:熊猫爆竹命中<color=#3cff28>冻结</color>敌人时,为团队附加<color=#3cff28>亢奋</color>效果,<color=#3cff28>3</color>回合" ["desc"]="熊猫爆竹链接<color=#3cff28>6</color>个元素及以上时将释放<color=#3cff28>2</color>次"
}, },
[1400206]={ [1400206]={
["desc"]="潘达攻击提升<color=#3cff28>15%</color>。" ["desc"]="潘达攻击提升<color=#3cff28>15%</color>。"
}, },
[1400207]={ [1400207]={
["desc"]="熊猫爆竹链接<color=#3cff28>6</color>个元素及以上时将释放<color=#3cff28>2</color>次。" ["desc"]="熊猫爆竹攻击将释放<color=#3cff28>2</color>次。"
}, },
[2200100]={ [2200100]={
["desc"]="解锁拔刀斩:额外造成一次技能伤害。" ["desc"]="解锁拔刀斩:额外造成一次技能伤害。"
@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>Combo</color>:闪烁法师普攻和反击对<color=#3cff28>诅咒</color>敌人额外造成伤害提高至<color=#3cff28>100%</color>。" ["desc"]="<color=#fcff28>Combo</color>:闪烁法师普攻和反击对<color=#3cff28>诅咒</color>敌人额外造成伤害提高至<color=#3cff28>100%</color>。"
},
[1400300]={
["desc"]="解锁炼狱扳机:额外造成多次技能伤害,附加<color=#3cff28>易伤</color>效果,<color=#3cff28>2</color>回合。"
},
[1400301]={
["desc"]="炼狱扳机可恢复一定量生命。"
},
[1400302]={
["desc"]="<color=#fcff28>Combo</color>:皮侍普攻对<color=#3cff28>虚弱</color>敌人额外增伤。"
},
[1400303]={
["desc"]="炼狱扳机附加的易伤效果提升。"
},
[1400304]={
["desc"]="<color=#fcff28>Combo</color>:皮侍普攻<color=#3cff28>易伤</color>敌人将恢复生命。"
},
[1400305]={
["desc"]="炼狱扳机释放后为团队附加<color=#3cff28>重生</color>效果1回合。"
},
[1400306]={
["desc"]="皮侍攻击提升<color=#3cff28>15%</color>。"
},
[1400307]={
["desc"]="炼狱扳机附加的<color=#3cff28>重生</color>效果恢复能力增强,回合数<color=#3cff28>+1</color>。"
},
[2400300]={
["desc"]="解锁神速一闪:额外造成多次技能伤害,<color=#3cff28>50%</color>概率附加<color=#3cff28>眩晕</color>效果,<color=#3cff28>1</color>回合。"
},
[2400301]={
["desc"]="神速一闪横向可额外消除<color=#3cff28>4</color>格。"
},
[2400302]={
["desc"]="神速一闪附加的<color=#3cff28>眩晕</color>效果,回合数<color=#3cff28>+1</color>。"
},
[2400303]={
["desc"]="<color=#fcff28>Combo</color>:善意普攻<color=#3cff28>易伤</color>敌人有<color=#3cff28>10%</color>概率附加<color=#3cff28>流血</color>效果2回合。"
},
[2400304]={
["desc"]="神速一闪纵向可额外消除<color=#3cff28>4</color>格。"
},
[2400305]={
["desc"]="神速一闪每击杀<color=#3cff28>1</color>个敌人,全体攻击提升<color=#3cff28>10%</color>。"
},
[2400306]={
["desc"]="<color=#fcff28>Combo</color>:善意普攻<color=#3cff28>易伤</color>敌人附加<color=#3cff28>流血</color>的概率提升至<color=#3cff28>20%</color>。"
},
[2400307]={
["desc"]="神速一闪击杀敌人后将恢复生命。"
},
[3400300]={
["desc"]="解锁绝命啃咬:额外造成多次技能伤害,并随机消除<color=#3cff28>3</color>个元素。"
},
[3400301]={
["desc"]="绝命啃咬可附加<color=#3cff28>流血</color>效果,<color=#3cff28>2</color>回合。"
},
[3400302]={
["desc"]="绝命啃咬消除的元素提供技能能量*<color=#3cff28>2</color>。"
},
[3400303]={
["desc"]="<color=#fcff28>Combo</color>:忍者菲尔普攻<color=#3cff28>易伤</color>敌人有10%概率附加流血效果2回合。"
},
[3400304]={
["desc"]="绝命啃咬使用时本次普攻伤害提升。"
},
[3400305]={
["desc"]="绝命啃咬释放后为团队附加<color=#3cff28>反伤</color>效果2回合。"
},
[3400306]={
["desc"]="绝命啃咬随机消除元素<color=#3cff28>+3</color>。"
},
[3400307]={
["desc"]="绝命啃咬附加<color=#3cff28>反伤</color>效果提升。"
},
[4400300]={
["desc"]="解锁旋转月轮:额外造成多次技能伤害,<color=#3cff28>50%</color>概率附加<color=#3cff28>冻结</color>效果,<color=#3cff28>1</color>回合。"
},
[4400301]={
["desc"]="旋转月轮纵向可额外消除<color=#3cff28>4</color>格。"
},
[4400302]={
["desc"]="<color=#fcff28>Combo</color>:月之法师普攻对<color=#3cff28>眩晕</color>敌人额外增伤"
},
[4400303]={
["desc"]="旋转月轮技能伤害提升。"
},
[4400304]={
["desc"]="旋转月轮附加的<color=#3cff28>冻结</color>效果,回合数<color=#3cff28>+1</color>。"
},
[4400305]={
["desc"]="月之法师普攻有10%概率附加<color=#3cff28>冰霜</color>效果,<color=#3cff28>2</color>回合。"
},
[4400306]={
["desc"]="旋转月轮横向可额外消除<color=#3cff28>4</color>格。"
},
[4400307]={
["desc"]="旋转月轮链接<color=#3cff28>6</color>个元素及以上时,技能攻击额外释放一次。"
},
[5400300]={
["desc"]="解锁堕落之剑:额外造成一次大量技能伤害,附加<color=#3cff28>腐败</color>效果,<color=#3cff28>1</color>回合。"
},
[5400301]={
["desc"]="堕落之剑沿X方向可额外消除<color=#3cff28>4</color>格。"
},
[5400302]={
["desc"]="堕落骑士普攻有<color=#3cff28>10%</color>概率附加<color=#3cff28>中毒</color>效果,<color=#3cff28>2</color>回合。"
},
[5400303]={
["desc"]="堕落之剑附加的<color=#3cff28>腐败</color>效果,回合数<color=#3cff28>+1</color>。"
},
[5400304]={
["desc"]="堕落之剑沿X方向可额外消除<color=#3cff28>4</color>格。"
},
[5400305]={
["desc"]="堕落之剑链接<color=#3cff28>6</color>个元素及以上时,附加<color=#3cff28>昏睡</color>效果,<color=#3cff28>1</color>回合。"
},
[5400306]={
["desc"]="堕落之剑每连接<color=#3cff28>4</color>个元素,技能伤害提升一次。"
},
[5400307]={
["desc"]="堕落之剑附加的<color=#3cff28>昏睡</color>效果,回合数<color=#3cff28>+1</color>。"
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -15,7 +15,7 @@ local skin = {
}, },
[1400201]={ [1400201]={
["value"]="泳池派对" ["value"]="沙滩王者"
}, },
[14003]={ [14003]={

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -73,6 +73,21 @@ local equip = {
}, },
[1400205]={ [1400205]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
}, },
[2200101]={ [2200101]={
@ -148,6 +163,21 @@ local equip = {
}, },
[2400205]={ [2400205]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
}, },
[3200101]={ [3200101]={
@ -223,6 +253,21 @@ local equip = {
}, },
[3400205]={ [3400205]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
}, },
[4200101]={ [4200101]={
@ -298,6 +343,21 @@ local equip = {
}, },
[4400205]={ [4400205]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
}, },
[5200101]={ [5200101]={
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -13,6 +13,9 @@ local hero = {
}, },
[14002]={ [14002]={
},
[14003]={
}, },
[22001]={ [22001]={
@ -28,6 +31,9 @@ local hero = {
}, },
[24002]={ [24002]={
},
[24003]={
}, },
[32001]={ [32001]={
@ -43,6 +49,9 @@ local hero = {
}, },
[34002]={ [34002]={
},
[34003]={
}, },
[42001]={ [42001]={
@ -58,6 +67,9 @@ local hero = {
}, },
[44002]={ [44002]={
},
[44003]={
}, },
[52001]={ [52001]={
@ -73,9 +85,12 @@ local hero = {
}, },
[54002]={ [54002]={
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35. Submarine Control Room" ["name"]="35. Submarine Control Room"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands" ["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands"
}, },
[1400301]={
["name"]="Cat's Claw,Spiked Claw,Azure Steel Claw,Shredding Claw,Sky-Cleaving Claw,Fortune's Blessing"
},
[1400302]={
["name"]="Rugged Steel Helm,Fine Steel Visor,Obsidian Noble Crown,Gallant Coronet,Dragonhorn Circlet,Eternal Glory Crown"
},
[1400303]={
["name"]="Thick Woven Vestment,Thin Steel Hauberk,Dark Iron Plate,Champion's Jade Armor,Wyrmhide Golden Plate,Eternal Heavy Plate"
},
[1400304]={
["name"]="Leather Belt,Ebony Gold Waistband,Knight's Baldric,Wyrm Sinew Belt,Eternal Girth,Bronze Bracelet"
},
[1400305]={
["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands"
},
[2200101]={ [2200101]={
["name"]="Crescent Blade,Wolf Fang,Celestial Chroma,End of Waterfall,Devilcleaver,Dracobane" ["name"]="Crescent Blade,Wolf Fang,Celestial Chroma,End of Waterfall,Devilcleaver,Dracobane"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands" ["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands"
}, },
[2400301]={
["name"]="Mjölnir,Lightning Mjölnir,Tremor Mjölnir,Skyshaking Mjölnir,Mjölnir of Penitence,Thunderbolt Mjölnir"
},
[2400302]={
["name"]="Rugged Steel Helm,Fine Steel Visor,Obsidian Noble Crown,Gallant Coronet,Dragonhorn Circlet,Eternal Glory Crown"
},
[2400303]={
["name"]="Thick Woven Vestment,Thin Steel Hauberk,Dark Iron Plate,Champion's Jade Armor,Wyrmhide Golden Plate,Eternal Heavy Plate"
},
[2400304]={
["name"]="Leather Belt,Ebony Gold Waistband,Knight's Baldric,Wyrm Sinew Belt,Eternal Girth,Bronze Bracelet"
},
[2400305]={
["name"]="Bronze Bracelet,Leather Wristbands,Ironheart Wristbands,Heroic Gauntlets,Dragonwhisker Wristguards,Eternal Wristbands"
},
[3200101]={ [3200101]={
["name"]="Lance,Mighty Lance,Sundering Lance,Unyielding Lance,Galeforce Lance,Titan's Tempest" ["name"]="Lance,Mighty Lance,Sundering Lance,Unyielding Lance,Galeforce Lance,Titan's Tempest"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards" ["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards"
}, },
[3400301]={
["name"]="Bewitching Soul,Radiant Smile,Delicacy,Sapphire Glance,Resplendent Star,Celestial Eclipse"
},
[3400302]={
["name"]="Floral Circlet,Pearl Circlet,Flame Gilded Circlet,Serene Jade Circlet,Starry Phoenix Circlet,Supreme Crown"
},
[3400303]={
["name"]="Soft Leather Robe,Jade-Adorned Robe,Purple Gauze Silk,Amber-hued Robe,Phoenix Feather Robe,Sovereign Celestial Robe"
},
[3400304]={
["name"]="Embroidered Belt,Elegant Waist Band,Pearl-embroidered Belt,Astral Glory Belt,Phoenix Gaze Belt,Ultimate Immortal Belt"
},
[3400305]={
["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards"
},
[4200101]={ [4200101]={
["name"]="Wand,Exquisite Wand,Crystal Wand,Glacial Wand,Starfrost Wand,Frost Realm" ["name"]="Wand,Exquisite Wand,Crystal Wand,Glacial Wand,Starfrost Wand,Frost Realm"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards" ["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards"
}, },
[4400301]={
["name"]="Orb,Dust Veiled Orb,Twilight Orb,Rune Orb,Cursed Orb,Pharaoh's Mind"
},
[4400302]={
["name"]="Floral Circlet,Pearl Circlet,Flame Gilded Circlet,Serene Jade Circlet,Starry Phoenix Circlet,Supreme Crown"
},
[4400303]={
["name"]="Soft Leather Robe,Jade-Adorned Robe,Purple Gauze Silk,Amber-hued Robe,Phoenix Feather Robe,Sovereign Celestial Robe"
},
[4400304]={
["name"]="Embroidered Belt,Elegant Waist Band,Pearl-embroidered Belt,Astral Glory Belt,Phoenix Gaze Belt,Ultimate Immortal Belt"
},
[4400305]={
["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards"
},
[5200101]={ [5200101]={
["name"]="Shuriken,Large Shuriken,Mechanical Shuriken,Gale Shuriken,Spectral Shuriken,Shadow Tracer" ["name"]="Shuriken,Large Shuriken,Mechanical Shuriken,Gale Shuriken,Spectral Shuriken,Shadow Tracer"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards" ["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards"
},
[5400301]={
["name"]="Chakram,Serpent Chakram,Crescent Chakram,Heartbreak Ring,Soulrift Ring,Lunar Trace"
},
[5400302]={
["name"]="Floral Circlet,Pearl Circlet,Flame Gilded Circlet,Serene Jade Circlet,Starry Phoenix Circlet,Supreme Crown"
},
[5400303]={
["name"]="Soft Leather Robe,Jade-Adorned Robe,Purple Gauze Silk,Amber-hued Robe,Phoenix Feather Robe,Sovereign Celestial Robe"
},
[5400304]={
["name"]="Embroidered Belt,Elegant Waist Band,Pearl-embroidered Belt,Astral Glory Belt,Phoenix Gaze Belt,Ultimate Immortal Belt"
},
[5400305]={
["name"]="Lavender Iron Bracelet,Ethereal Veil Gauntlets,Golden Brilliance Gauntlets,Stellar Gauntlets,Phoenix Bone Gauntlets,Supreme Sovereign Armguards"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="Panda", ["name"]="Panda",
["desc"]="Panda's prowess extends beyond its claws—firecrackers add to the spectacle." ["desc"]="Panda's prowess extends beyond its claws—firecrackers add to the spectacle."
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="Blade Maid", ["name"]="Blade Maid",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="Thor", ["name"]="Thor",
["desc"]="Want to test the might of Mjolnir?" ["desc"]="Want to test the might of Mjolnir?"
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="Onion", ["name"]="Onion",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="Nightmare", ["name"]="Nightmare",
["desc"]="Come have some fun!" ["desc"]="Come have some fun!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="Iceheart", ["name"]="Iceheart",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="Cleopatra", ["name"]="Cleopatra",
["desc"]="Beauty wields its own charm as a weapon." ["desc"]="Beauty wields its own charm as a weapon."
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="Ninja Lun", ["name"]="Ninja Lun",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="Twinkling Mage", ["name"]="Twinkling Mage",
["desc"]="Evil meets its demise here and now." ["desc"]="Evil meets its demise here and now."
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="Phantom Combo: Deal skill damage multiple times." ["desc"]="Phantom Combo: Deal skill damage multiple times."
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>Combo</color>: Twinkling Mage's normal attack and counterattack damage to <color=#3cff28>Curse</color> enemies increase to <color=#3cff28>100%</color>." ["desc"]="<color=#fcff28>Combo</color>: Twinkling Mage's normal attack and counterattack damage to <color=#3cff28>Curse</color> enemies increase to <color=#3cff28>100%</color>."
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35. Control del Submarino" ["name"]="35. Control del Submarino"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["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 Cobre,Muñequera de Cuero,Muñequera de Hierro,Guanteletes de Héroe,Muñequera de Barba de Dragón,Muñequera Eterna"
}, },
[1400301]={
["name"]="Golpe de gato,Puño con Pinchos,Puño de Acero Verde,Puño Lacerante,Puño en Cielo ,Poder de Fortuna"
},
[1400302]={
["name"]="Visera de Acero Bruto,Visera de Acero Fino,Corona de obsidiana,Corona de héroe,Corona de Cuerno de Dragón,Corona Eterna"
},
[1400303]={
["name"]="Túnica Gruesa,Armadura de Acero Delgado,Armadura Pesada,Armadura de Jade,Casco Dorado de Escamas de Dragón,Armadura Pesada Eterna"
},
[1400304]={
["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"
},
[1400305]={
["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"
},
[2200101]={ [2200101]={
["name"]="Machete,Colmillo de Lobo,Cuchillo de Iris,Cortador de Cascada,Cuchillo contra Diablos,Cuchillo contra Dragón" ["name"]="Machete,Colmillo de Lobo,Cuchillo de Iris,Cortador de Cascada,Cuchillo contra Diablos,Cuchillo contra Dragón"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["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 Cobre,Muñequera de Cuero,Muñequera de Hierro,Guanteletes de Héroe,Muñequera de Barba de Dragón,Muñequera Eterna"
}, },
[2400301]={
["name"]="Martillo de Trueno,Martillo de Rayos y Truenos,Martillo de Tremor,Martillo Poderoso,Martillo de Castigo,Martillo de Relámpago"
},
[2400302]={
["name"]="Visera de Acero Bruto,Visera de Acero Fino,Corona de obsidiana,Corona de héroe,Corona de Cuerno de Dragón,Corona Eterna"
},
[2400303]={
["name"]="Túnica Gruesa,Armadura de Acero Delgado,Armadura Pesada,Armadura de Jade,Casco Dorado de Escamas de Dragón,Armadura Pesada Eterna"
},
[2400304]={
["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"
},
[2400305]={
["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"
},
[3200101]={ [3200101]={
["name"]="Lanza,Lanza Poderosa ,Lanza Rompearmaduras,Lanza Indomable,Lanza de Ventarrón,Tormenta de Titán" ["name"]="Lanza,Lanza Poderosa ,Lanza Rompearmaduras,Lanza Indomable,Lanza de Ventarrón,Tormenta de Titán"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema" ["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema"
}, },
[3400301]={
["name"]="Encanto de Corazón,Sonrisa,Exquisitez,Ojos Azules,Estrella Brillante,Eclipse Celestial"
},
[3400302]={
["name"]="Corona Floral,Corona con Perlas,Corona de Fuego,Corona de Jade,Corona de Fénix,Corona Suprema"
},
[3400303]={
["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"
},
[3400304]={
["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"
},
[3400305]={
["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema"
},
[4200101]={ [4200101]={
["name"]="Varita Mágica,Varita Delicada,Varita de Cristal,Varita de Hielo,Varita de Escarcha,Reino Nevado" ["name"]="Varita Mágica,Varita Delicada,Varita de Cristal,Varita de Hielo,Varita de Escarcha,Reino Nevado"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema" ["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema"
}, },
[4400301]={
["name"]="Orbe,Orbe Polvoriento,Orbe Pálido,Orbe con Rúnico,Orbe de Maldición ,Corazón de Faraón"
},
[4400302]={
["name"]="Corona Floral,Corona con Perlas,Corona de Fuego,Corona de Jade,Corona de Fénix,Corona Suprema"
},
[4400303]={
["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"
},
[4400304]={
["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"
},
[4400305]={
["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema"
},
[5200101]={ [5200101]={
["name"]="Shuriken,Shuriken Grande,Shuriken Mecánico,Shuriken de Vendaval,Shuriken de Fantasma,Cazador de Sombras" ["name"]="Shuriken,Shuriken Grande,Shuriken Mecánico,Shuriken de Vendaval,Shuriken de Fantasma,Cazador de Sombras"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema" ["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema"
},
[5400301]={
["name"]="Hoja de Anillo,Anillo Serpentino,Anillo de Luna Creciente,Anillo Cruel,Separador de Alma,Marcas de Luna"
},
[5400302]={
["name"]="Corona Floral,Corona con Perlas,Corona de Fuego,Corona de Jade,Corona de Fénix,Corona Suprema"
},
[5400303]={
["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"
},
[5400304]={
["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"
},
[5400305]={
["name"]="Pulsera de Hierro Morado,Guanteletes de Velo,Guanteletes de Oro,Guanteletes de Estrellas,Guanteletes de Hueso de Fénix,Armadura de Mano Suprema"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="Panda", ["name"]="Panda",
["desc"]="Panda no solo es bueno con las garras, sino también con los petardos." ["desc"]="Panda no solo es bueno con las garras, sino también con los petardos."
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="Chica con Daga", ["name"]="Chica con Daga",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="Sol", ["name"]="Sol",
["desc"]="¿Quieres probar el poder del Martillo de Thor?" ["desc"]="¿Quieres probar el poder del Martillo de Thor?"
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="Cabeza de Cebolla", ["name"]="Cabeza de Cebolla",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="Íncubo", ["name"]="Íncubo",
["desc"]="¡Ven a divertirte!" ["desc"]="¡Ven a divertirte!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="Alma Glacial", ["name"]="Alma Glacial",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="Cleopatra", ["name"]="Cleopatra",
["desc"]="La belleza también es un arma." ["desc"]="La belleza también es un arma."
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="Ninja Jay", ["name"]="Ninja Jay",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="Mago Brillante", ["name"]="Mago Brillante",
["desc"]="Aquí se acaba el mal." ["desc"]="Aquí se acaba el mal."
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="Hits de Sombra: causa varios daños de habilidad adicionales." ["desc"]="Hits de Sombra: causa varios daños de habilidad adicionales."
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>Combo</color>: daño de ataque común y contraataque causado por Mago Brillante a los enemigos <color=#3cff28>Maldecidos</color> aumenta a <color=#3cff28>100%</color>." ["desc"]="<color=#fcff28>Combo</color>: daño de ataque común y contraataque causado por Mago Brillante a los enemigos <color=#3cff28>Maldecidos</color> aumenta a <color=#3cff28>100%</color>."
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -73,6 +73,21 @@ local equip = {
}, },
[1400205]={ [1400205]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
}, },
[2200101]={ [2200101]={
@ -148,6 +163,21 @@ local equip = {
}, },
[2400205]={ [2400205]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
}, },
[3200101]={ [3200101]={
@ -223,6 +253,21 @@ local equip = {
}, },
[3400205]={ [3400205]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
}, },
[4200101]={ [4200101]={
@ -298,6 +343,21 @@ local equip = {
}, },
[4400205]={ [4400205]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
}, },
[5200101]={ [5200101]={
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -13,6 +13,9 @@ local hero = {
}, },
[14002]={ [14002]={
},
[14003]={
}, },
[22001]={ [22001]={
@ -28,6 +31,9 @@ local hero = {
}, },
[24002]={ [24002]={
},
[24003]={
}, },
[32001]={ [32001]={
@ -43,6 +49,9 @@ local hero = {
}, },
[34002]={ [34002]={
},
[34003]={
}, },
[42001]={ [42001]={
@ -58,6 +67,9 @@ local hero = {
}, },
[44002]={ [44002]={
},
[44003]={
}, },
[52001]={ [52001]={
@ -73,9 +85,12 @@ local hero = {
}, },
[54002]={ [54002]={
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35. Kokpit Kapal Selam" ["name"]="35. Kokpit Kapal Selam"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi" ["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi"
}, },
[1400301]={
["name"]="Cakar Kucing,Cakar Duri,Cakar Baja Azure,Cakar Pencabik,Cakar Pembelah Langit,Berkah Keberuntungan"
},
[1400302]={
["name"]="Helm Baja Kasar,Pelindung Baja Halus,Mahkota Obsidian,Coronet Perkasa,Circlet Tanduk Naga,Mahkota Kemuliaan Abadi"
},
[1400303]={
["name"]="Jubah Tenun Tebal,Armor Cincin Baja Tipis,Plat Besi Gelap,Armor Giok Sang Juara,Plat Emas Wyrmhide,Plat Berat Abadi"
},
[1400304]={
["name"]="Sabuk Kulit,Tali Pinggang Emas Eboni,Ksatria Baldric,Sabuk Otot Wyrm,Lingkar Kekal,Gelang Bronze"
},
[1400305]={
["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi"
},
[2200101]={ [2200101]={
["name"]="Pedang Sabit,Wolf Fang,Kroma Langit,Pedang Air Terjun,Pedang Pembelah Iblis,Pedang Dracobane" ["name"]="Pedang Sabit,Wolf Fang,Kroma Langit,Pedang Air Terjun,Pedang Pembelah Iblis,Pedang Dracobane"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi" ["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi"
}, },
[2400301]={
["name"]="Palu Thor,Palu Petir Thor,Palu Getar Thor,Palu Guntur Thor,Palu Pertobatan Thor,Palu Thunderbolt Thor"
},
[2400302]={
["name"]="Helm Baja Kasar,Pelindung Baja Halus,Mahkota Obsidian,Coronet Perkasa,Circlet Tanduk Naga,Mahkota Kemuliaan Abadi"
},
[2400303]={
["name"]="Jubah Tenun Tebal,Armor Cincin Baja Tipis,Plat Besi Gelap,Armor Giok Sang Juara,Plat Emas Wyrmhide,Plat Berat Abadi"
},
[2400304]={
["name"]="Sabuk Kulit,Tali Pinggang Emas Eboni,Ksatria Baldric,Sabuk Otot Wyrm,Lingkar Kekal,Gelang Bronze"
},
[2400305]={
["name"]="Gelang Bronze,Gelang Kulit,Gelang Hati Besi,Sarung Tangan Heroik,Pelindung Tangan Kumis Naga,Gelang Abadi"
},
[3200101]={ [3200101]={
["name"]="Tombak,Tombak Perkasa,Tombak Sunderan,Tombak Pantang Menyerah,Tombak Galeforce,Badai Titan" ["name"]="Tombak,Tombak Perkasa,Tombak Sunderan,Tombak Pantang Menyerah,Tombak Galeforce,Badai Titan"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung" ["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung"
}, },
[3400301]={
["name"]="Jiwa Mempesona,Senyum Berseri,Gesit,Sekilas Safir,Bintang Gemilang,Gerhana Langit"
},
[3400302]={
["name"]="Circlet Bunga,Circlet Mutiara,Circlet Api Emas,Circlet Giok,Circlet Phoenix,Mahkota Agung"
},
[3400303]={
["name"]="Jubah Kulit Lembut,Jubah Giok,Sutra Kasa Ungu,Jubah Amber,Jubah Bulu Phoenix,Jubah Bintang Daulat"
},
[3400304]={
["name"]="Sabuk Bordir,Tali Pinggang Elegan,Sabuk Mutiara,Sabuk Astral,Sabuk Phoenix,Sabuk Abadi"
},
[3400305]={
["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung"
},
[4200101]={ [4200101]={
["name"]="Tongkat,Tongkat Indah,Tongkat Kristal,Tongkat Glasial,Tongkat Es,Alam Es" ["name"]="Tongkat,Tongkat Indah,Tongkat Kristal,Tongkat Glasial,Tongkat Es,Alam Es"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung" ["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung"
}, },
[4400301]={
["name"]="Bola,Bola Selubung Debu,Bola Senja,Bola Rune,Bola Terkutuk,Pikiran Firaun"
},
[4400302]={
["name"]="Circlet Bunga,Circlet Mutiara,Circlet Api Emas,Circlet Giok,Circlet Phoenix,Mahkota Agung"
},
[4400303]={
["name"]="Jubah Kulit Lembut,Jubah Giok,Sutra Kasa Ungu,Jubah Amber,Jubah Bulu Phoenix,Jubah Bintang Daulat"
},
[4400304]={
["name"]="Sabuk Bordir,Tali Pinggang Elegan,Sabuk Mutiara,Sabuk Astral,Sabuk Phoenix,Sabuk Abadi"
},
[4400305]={
["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung"
},
[5200101]={ [5200101]={
["name"]="Shuriken,Shuriken Besar,Shuriken Mekanik,Shuriken Gale,Shuriken Spektral,Pelacak Bayangan" ["name"]="Shuriken,Shuriken Besar,Shuriken Mekanik,Shuriken Gale,Shuriken Spektral,Pelacak Bayangan"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung" ["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung"
},
[5400301]={
["name"]="Cakram,Cakram Ular,Cakram Sabit,Cincin Patah Hati,Cincin Soulrift,Jejak Lunar"
},
[5400302]={
["name"]="Circlet Bunga,Circlet Mutiara,Circlet Api Emas,Circlet Giok,Circlet Phoenix,Mahkota Agung"
},
[5400303]={
["name"]="Jubah Kulit Lembut,Jubah Giok,Sutra Kasa Ungu,Jubah Amber,Jubah Bulu Phoenix,Jubah Bintang Daulat"
},
[5400304]={
["name"]="Sabuk Bordir,Tali Pinggang Elegan,Sabuk Mutiara,Sabuk Astral,Sabuk Phoenix,Sabuk Abadi"
},
[5400305]={
["name"]="Gelang Besi Lavender,Sarung Tangan Cadar Ethereal,Sarung Tangan Emas Cemerlang,Sarung Tangan Bintang,Sarung Tulang Phoenix,Pelindung Lengan Sovereign Agung"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="Panda", ["name"]="Panda",
["desc"]="Panda tidak hanya jago dalam cakarnya, tapi juga dalam petasan." ["desc"]="Panda tidak hanya jago dalam cakarnya, tapi juga dalam petasan."
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="Gadis Pedang", ["name"]="Gadis Pedang",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="Thor", ["name"]="Thor",
["desc"]="Ingin mencoba kekuatan Palu Thor?" ["desc"]="Ingin mencoba kekuatan Palu Thor?"
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="Kepala Bawang", ["name"]="Kepala Bawang",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="Nightmare", ["name"]="Nightmare",
["desc"]="Datang dan bersenang-senanglah!" ["desc"]="Datang dan bersenang-senanglah!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="Hati Es", ["name"]="Hati Es",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="Cleopatra", ["name"]="Cleopatra",
["desc"]="Keindahan juga merupakan senjata." ["desc"]="Keindahan juga merupakan senjata."
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="Ninja Jay", ["name"]="Ninja Jay",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="Blink Mage", ["name"]="Blink Mage",
["desc"]="Di sinilah kejahatan berakhir." ["desc"]="Di sinilah kejahatan berakhir."
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="Strike Phantom: Menyebabkan beberapa DMG skill tambahan." ["desc"]="Strike Phantom: Menyebabkan beberapa DMG skill tambahan."
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>Combo</color>: Blink Mage Punch dan Serangan Balik memberikan DMG ekstra pada musuh yang <color=#3cff28>terkutuk</color> meningkat menjadi <color=#3cff28>100%</color>." ["desc"]="<color=#fcff28>Combo</color>: Blink Mage Punch dan Serangan Balik memberikan DMG ekstra pada musuh yang <color=#3cff28>terkutuk</color> meningkat menjadi <color=#3cff28>100%</color>."
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35.潜水艦の制御室" ["name"]="35.潜水艦の制御室"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド" ["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド"
}, },
[1400301]={
["name"]="猫の爪,トゲの爪,鋼の爪,裂傷の爪,空を切り裂く爪,福神の力"
},
[1400302]={
["name"]="鋼の仮面,ファインスチール製仮面,黒曜石の冠,勇気の冠,竜角の冠,永遠の冠"
},
[1400303]={
["name"]="厚織りの法衣,薄鋼鉄製ハウバーク,玄鉄の鎧,強者の鎧,竜鱗の鎧,永遠の鎧"
},
[1400304]={
["name"]="革ベルト,黒檀ゴールドのガードル,騎士のベルト,竜腱のガードル,永遠のガードル,銅のブレスレット"
},
[1400305]={
["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド"
},
[2200101]={ [2200101]={
["name"]="クレセントブレード,狼牙,セレスティアルクロマ,滝の終点,デビルクリーバー,斬竜刀" ["name"]="クレセントブレード,狼牙,セレスティアルクロマ,滝の終点,デビルクリーバー,斬竜刀"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド" ["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド"
}, },
[2400301]={
["name"]="ミョルニル,ライトニングミョルニル,トレマーミョルニル,スカイシェイキングミョルニル,懺悔のミョルニル,サンダーボルトミョルニル"
},
[2400302]={
["name"]="鋼の仮面,ファインスチール製仮面,黒曜石の冠,勇気の冠,竜角の冠,永遠の冠"
},
[2400303]={
["name"]="厚織りの法衣,薄鋼鉄製ハウバーク,玄鉄の鎧,強者の鎧,竜鱗の鎧,永遠の鎧"
},
[2400304]={
["name"]="革ベルト,黒檀ゴールドのガードル,騎士のベルト,竜腱のガードル,永遠のガードル,銅のブレスレット"
},
[2400305]={
["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド"
},
[3200101]={ [3200101]={
["name"]="ランス,強力なランス,鎧破りのランス,不屈のランス,狂風のランス,巨人ストーム" ["name"]="ランス,強力なランス,鎧破りのランス,不屈のランス,狂風のランス,巨人ストーム"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット"
}, },
[3400301]={
["name"]="チャームハート,晴れやかな笑顔,玲瓏,サファイアの輝き,星の如く,日食"
},
[3400302]={
["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし"
},
[3400303]={
["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ"
},
[3400304]={
["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ"
},
[3400305]={
["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット"
},
[4200101]={ [4200101]={
["name"]="魔法の杖,精巧な杖,水晶の杖,氷の杖,霜星の杖,氷雪の世界" ["name"]="魔法の杖,精巧な杖,水晶の杖,氷の杖,霜星の杖,氷雪の世界"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット"
}, },
[4400301]={
["name"]="オーブ,ダストベールドオーブ,トワイライトオーブ,ルーンオーブ,呪いのオーブ,ファラオの心"
},
[4400302]={
["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし"
},
[4400303]={
["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ"
},
[4400304]={
["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ"
},
[4400305]={
["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット"
},
[5200101]={ [5200101]={
["name"]="手裏剣,大型手裏剣,機関手裏剣,疾風手裏剣,幽霊手裏剣,影を追う" ["name"]="手裏剣,大型手裏剣,機関手裏剣,疾風手裏剣,幽霊手裏剣,影を追う"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット"
},
[5400301]={
["name"]="チャクラム,サーペントチャクラム,三日月チャクラム,ハートブレイクリング,ソウルリフトリング,月の痕"
},
[5400302]={
["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし"
},
[5400303]={
["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ"
},
[5400304]={
["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ"
},
[5400305]={
["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="パンダ", ["name"]="パンダ",
["desc"]="引っ掻きはもちろん、クラッカーも得意なんだぜ。" ["desc"]="引っ掻きはもちろん、クラッカーも得意なんだぜ。"
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="ブレードメイド", ["name"]="ブレードメイド",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="ソー", ["name"]="ソー",
["desc"]="試してみるか、こいつの威力を。" ["desc"]="試してみるか、こいつの威力を。"
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="タマネギ", ["name"]="タマネギ",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="夢魔", ["name"]="夢魔",
["desc"]="一緒に楽しもう!" ["desc"]="一緒に楽しもう!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="氷心", ["name"]="氷心",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="クレオパトラ", ["name"]="クレオパトラ",
["desc"]="美しさだって立派な武器です。" ["desc"]="美しさだって立派な武器です。"
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="忍者リン", ["name"]="忍者リン",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="トゥインクリングメイジ", ["name"]="トゥインクリングメイジ",
["desc"]="ここが邪悪なるものの終着点。" ["desc"]="ここが邪悪なるものの終着点。"
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="ファントムヒット:追加でスキルを複数回発動する。" ["desc"]="ファントムヒット:追加でスキルを複数回発動する。"
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>ヒット</color>:トゥインクリングメイジの通常攻撃と反撃は<color=#3cff28>呪い</color>状態の敵にダメージが<color=#3cff28>100%</color>アップ。" ["desc"]="<color=#fcff28>ヒット</color>:トゥインクリングメイジの通常攻撃と反撃は<color=#3cff28>呪い</color>状態の敵にダメージが<color=#3cff28>100%</color>アップ。"
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35. 잠수함 통제실" ["name"]="35. 잠수함 통제실"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대" ["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대"
}, },
[1400301]={
["name"]="고양이 펀치,손톱 세운 고양이 펀치,브론즈 고양이 펀치,거친 고양이 펀치,무시무시한 고양이 펀치,행운의 신이 내린 축복"
},
[1400302]={
["name"]="거친 강철 마스크,정교한 강철 마스크,어둠의 노블 왕관,용맹의 왕관,용의 뿔로 만든 왕관,화려한 영원의 왕관"
},
[1400303]={
["name"]="두꺼운 니트 두루마기,얇은 강철 갑옷,검은 빛을 띤 무거운 중갑,강자의 옥 갑옷,용비늘 황금 투구,영원의 중갑"
},
[1400304]={
["name"]="가죽 벨트,검은 황금 허리띠,기사의 벨트,용의 힘줄 허리띠,영원의 허리띠 장식,브론즈 팔찌"
},
[1400305]={
["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대"
},
[2200101]={ [2200101]={
["name"]="굽이칼,늑대의 굽이칼,하늘의 크로마 칼,폭포를 가르는 칼,악마 도살 칼,드래곤 슬레이어" ["name"]="굽이칼,늑대의 굽이칼,하늘의 크로마 칼,폭포를 가르는 칼,악마 도살 칼,드래곤 슬레이어"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대" ["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대"
}, },
[2400301]={
["name"]="묠니르,번개 묠니르,땅을 가르는 묠니르,하늘을 울리는 묠니르,처벌의 묠니르,궁극의 묠니르"
},
[2400302]={
["name"]="거친 강철 마스크,정교한 강철 마스크,어둠의 노블 왕관,용맹의 왕관,용의 뿔로 만든 왕관,화려한 영원의 왕관"
},
[2400303]={
["name"]="두꺼운 니트 두루마기,얇은 강철 갑옷,검은 빛을 띤 무거운 중갑,강자의 옥 갑옷,용비늘 황금 투구,영원의 중갑"
},
[2400304]={
["name"]="가죽 벨트,검은 황금 허리띠,기사의 벨트,용의 힘줄 허리띠,영원의 허리띠 장식,브론즈 팔찌"
},
[2400305]={
["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대"
},
[3200101]={ [3200101]={
["name"]="파이크,강력한 파이크,관통의 파이크,불굴의 파이크,강풍의 파이크,거대한 폭풍" ["name"]="파이크,강력한 파이크,관통의 파이크,불굴의 파이크,강풍의 파이크,거대한 폭풍"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머"
}, },
[3400301]={
["name"]="매력의 심장,아름다운 미소,정교한 아름다움,마음을 사로잡는 눈빛,찬란한 별,빛을 잃은 해와 달"
},
[3400302]={
["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관"
},
[3400303]={
["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브"
},
[3400304]={
["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트"
},
[3400305]={
["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머"
},
[4200101]={ [4200101]={
["name"]="마법 지팡이,정교한 지팡이,수정 지팡이,얼음의 지팡이,서리빛 지팡이,얼어붙은 세상" ["name"]="마법 지팡이,정교한 지팡이,수정 지팡이,얼음의 지팡이,서리빛 지팡이,얼어붙은 세상"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머"
}, },
[4400301]={
["name"]="마법 구슬,먼지 덮인 마법 구슬,어두운 빛의 마법 구슬,룬 마법 구슬,저주의 마법 구슬,파라오의 심장"
},
[4400302]={
["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관"
},
[4400303]={
["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브"
},
[4400304]={
["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트"
},
[4400305]={
["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머"
},
[5200101]={ [5200101]={
["name"]="수리검,대형 수리검,메커니즘 수리검,매우 빠른 수리검,유령 수리검,그림자 사냥꾼" ["name"]="수리검,대형 수리검,메커니즘 수리검,매우 빠른 수리검,유령 수리검,그림자 사냥꾼"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머"
},
[5400301]={
["name"]="차크람,뱀 형태의 차크람,초승달 차크람,자비 없는 차크람,영혼 분리 차크람,달의 흔적"
},
[5400302]={
["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관"
},
[5400303]={
["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브"
},
[5400304]={
["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트"
},
[5400305]={
["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="판다", ["name"]="판다",
["desc"]="판다는 날카로운 발톱을 가졌을 뿐만아니라 폭죽도 잘 터트립니다." ["desc"]="판다는 날카로운 발톱을 가졌을 뿐만아니라 폭죽도 잘 터트립니다."
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="블레이드", ["name"]="블레이드",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="토르", ["name"]="토르",
["desc"]="토르의 망치가 가진 힘을 시험해보고 싶은 건가?" ["desc"]="토르의 망치가 가진 힘을 시험해보고 싶은 건가?"
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="양파 헤드", ["name"]="양파 헤드",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="인큐버스", ["name"]="인큐버스",
["desc"]="재밌게 놀아보자고!" ["desc"]="재밌게 놀아보자고!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="얼음의 심장", ["name"]="얼음의 심장",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="클레오파트라", ["name"]="클레오파트라",
["desc"]="아름다움도 무기라고 할 수 있죠." ["desc"]="아름다움도 무기라고 할 수 있죠."
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="닌자 룬", ["name"]="닌자 룬",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="반짝이는 마법사", ["name"]="반짝이는 마법사",
["desc"]="여기가 바로 악의 무덤이야." ["desc"]="여기가 바로 악의 무덤이야."
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="팬텀 콤보: 여러 번의 스킬 피해를 추가로 입힙니다." ["desc"]="팬텀 콤보: 여러 번의 스킬 피해를 추가로 입힙니다."
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>Combo</color>: 반짝이는 마법사의 일반 공격과 반격이 <color=#3cff28>저주</color> 받은 적에게 추가로 입히는 대미지가 <color=#3cff28>100%</color>로 증가합니다." ["desc"]="<color=#fcff28>Combo</color>: 반짝이는 마법사의 일반 공격과 반격이 <color=#3cff28>저주</color> 받은 적에게 추가로 입히는 대미지가 <color=#3cff28>100%</color>로 증가합니다."
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35. Sala de Controle do Submarino" ["name"]="35. Sala de Controle do Submarino"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["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 Cobre,Braceletes de Couro,Braceletes de Coração de Ferro,Manoplas do Herói,Braceletes do Bigode do Dragão,Pulseiras da Eternidade"
}, },
[1400301]={
["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"
},
[1400302]={
["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"
},
[1400303]={
["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"
},
[1400304]={
["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"
},
[1400305]={
["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"
},
[2200101]={ [2200101]={
["name"]="Cimitarra,Cimitarra do Canino de Lobo,Lâmina do Arco-íris,Cortador da Cascata,Espada Exorcista,Decapitador do Dragão" ["name"]="Cimitarra,Cimitarra do Canino de Lobo,Lâmina do Arco-íris,Cortador da Cascata,Espada Exorcista,Decapitador do Dragão"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["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 Cobre,Braceletes de Couro,Braceletes de Coração de Ferro,Manoplas do Herói,Braceletes do Bigode do Dragão,Pulseiras da Eternidade"
}, },
[2400301]={
["name"]="Mjolnir,Mjolnir de Relâmpago,Mjolnir de Trovão Ressoante,Mjolnir de Trovão Celestial,Mjolnir da Punição,Mjolnir do Raios"
},
[2400302]={
["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"
},
[2400303]={
["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"
},
[2400304]={
["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"
},
[2400305]={
["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"
},
[3200101]={ [3200101]={
["name"]="Lança,Lança Forte,Lança Perfurante,Lança Inquebrável,Lança dos Ventos Furiosos,Tempestade do Gigante" ["name"]="Lança,Lança Forte,Lança Perfurante,Lança Inquebrável,Lança dos Ventos Furiosos,Tempestade do Gigante"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia" ["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia"
}, },
[3400301]={
["name"]="Encanta-coração,Revelação Risonha,Delicadeza,Olhar Esmeraldeado,Brilho das Estrelas,Eclipsador do Sol e Lua"
},
[3400302]={
["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"
},
[3400303]={
["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"
},
[3400304]={
["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"
},
[3400305]={
["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia"
},
[4200101]={ [4200101]={
["name"]="Varinha Mágica,Varinha Mágica Delicada,Varinha Mágica de Cristal,Varinha Mágica de Gelo,Varinha Mágica da Estrela Gélida,Terra Gelada" ["name"]="Varinha Mágica,Varinha Mágica Delicada,Varinha Mágica de Cristal,Varinha Mágica de Gelo,Varinha Mágica da Estrela Gélida,Terra Gelada"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia" ["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia"
}, },
[4400301]={
["name"]="Orbe Mágico,Orbe Mágico Empoeirado,Orbe Mágico Sombrio,Orbe Mágico Rúnico,Orbe Mágico da Maldição,Coração do Faraó"
},
[4400302]={
["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"
},
[4400303]={
["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"
},
[4400304]={
["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"
},
[4400305]={
["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia"
},
[5200101]={ [5200101]={
["name"]="Shuriken,Shuriken Grande,Shuriken Mecânica,Shuriken do Vendaval,Shuriken Fantasmagórica,Perseguidor de Sombras" ["name"]="Shuriken,Shuriken Grande,Shuriken Mecânica,Shuriken do Vendaval,Shuriken Fantasmagórica,Perseguidor de Sombras"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia" ["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia"
},
[5400301]={
["name"]="Chakram,Chakram Serpentino,Lua Crescente,Partidor de Corações,Anel da Alma Partida,Marca da Lua"
},
[5400302]={
["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"
},
[5400303]={
["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"
},
[5400304]={
["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"
},
[5400305]={
["name"]="Pulseira de Ferro Roxo,Manoplas de Musselina,Manoplas Adornados de Ouro,Manoplas das Estrelas,Manoplas do Osso da Fênix,Manoplas da Supremacia"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="Panda", ["name"]="Panda",
["desc"]="O Panda não é apenas incrível com suas garras, mas também com fogos de artifício." ["desc"]="O Panda não é apenas incrível com suas garras, mas também com fogos de artifício."
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="Senhorita dos Gumes", ["name"]="Senhorita dos Gumes",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="Thor", ["name"]="Thor",
["desc"]="Quer experimentar o poder do martelo de Thor?" ["desc"]="Quer experimentar o poder do martelo de Thor?"
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="Cabeça de Cebola", ["name"]="Cabeça de Cebola",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="Súcubo", ["name"]="Súcubo",
["desc"]="Vamos nos divertir!" ["desc"]="Vamos nos divertir!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="Alma Glacial", ["name"]="Alma Glacial",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="Cleópatra", ["name"]="Cleópatra",
["desc"]="A beleza também é uma arma." ["desc"]="A beleza também é uma arma."
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="Luninja", ["name"]="Luninja",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="Mago do Brilho", ["name"]="Mago do Brilho",
["desc"]="O mal termina aqui." ["desc"]="O mal termina aqui."
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="Ataque Fantasma: Causa múltiplos danos de habilidade adicionais." ["desc"]="Ataque Fantasma: Causa múltiplos danos de habilidade adicionais."
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>Combo</color>: Ataque normal e contra-ataque do Mago do Lampejo causam dano adicional a inimigos <color=#3cff28>amaldiçoados</color>, aumentando para <color=#3cff28>100%</color>." ["desc"]="<color=#fcff28>Combo</color>: Ataque normal e contra-ataque do Mago do Lampejo causam dano adicional a inimigos <color=#3cff28>amaldiçoados</color>, aumentando para <color=#3cff28>100%</color>."
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -73,6 +73,21 @@ local equip = {
}, },
[1400205]={ [1400205]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
}, },
[2200101]={ [2200101]={
@ -148,6 +163,21 @@ local equip = {
}, },
[2400205]={ [2400205]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
}, },
[3200101]={ [3200101]={
@ -223,6 +253,21 @@ local equip = {
}, },
[3400205]={ [3400205]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
}, },
[4200101]={ [4200101]={
@ -298,6 +343,21 @@ local equip = {
}, },
[4400205]={ [4400205]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
}, },
[5200101]={ [5200101]={
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -13,6 +13,9 @@ local hero = {
}, },
[14002]={ [14002]={
},
[14003]={
}, },
[22001]={ [22001]={
@ -28,6 +31,9 @@ local hero = {
}, },
[24002]={ [24002]={
},
[24003]={
}, },
[32001]={ [32001]={
@ -43,6 +49,9 @@ local hero = {
}, },
[34002]={ [34002]={
},
[34003]={
}, },
[42001]={ [42001]={
@ -58,6 +67,9 @@ local hero = {
}, },
[44002]={ [44002]={
},
[44003]={
}, },
[52001]={ [52001]={
@ -73,9 +85,12 @@ local hero = {
}, },
[54002]={ [54002]={
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35. ห้องควบคุมเรือดำน้ำ" ["name"]="35. ห้องควบคุมเรือดำน้ำ"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์" ["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์"
}, },
[1400301]={
["name"]="หมัดแมว,หมัดแมวหนามแหลม,หมัดแมวเหล็กเขียว,หมัดแมวฉีกขาด,หมัดแมวทะลวง,พลังเทพโชคลาภ"
},
[1400302]={
["name"]="เกราะหน้าเหล็กหยาบ,เกราะหน้าเหล็กเลิศ,มงกุฎออบซิเดียน,มงกุฎกล้าหาญ,มงกุฎเขามังกร,มงกุฎนิรันดร์"
},
[1400303]={
["name"]="เสื้อยาวถักหนา,เกราะวงแหวนเหล็กบาง,เกราะหนักเหล็ก,เกราะหยกผู้แข็งแกร่ง,บุตรขุนนางเกล็ดมังกร,เกราะหนักนิรันดร์"
},
[1400304]={
["name"]="เข็มขัดหนัง,คอร์เซ็ททอง,แหวนเอวอัศวิน,คอร์เซ็ทเอ็นมังกร,ห่วงโซ่เอวนิรันดร์,สร้อยข้อมือทองแดง"
},
[1400305]={
["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์"
},
[2200101]={ [2200101]={
["name"]="มีดโค้ง,มีดโค้งฟันหมาป่า,มีดเจาะรุ้ง,มีดตัดน้ำตก,มีดสังหารปีศาจ,มีดสังหารมังกร" ["name"]="มีดโค้ง,มีดโค้งฟันหมาป่า,มีดเจาะรุ้ง,มีดตัดน้ำตก,มีดสังหารปีศาจ,มีดสังหารมังกร"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์" ["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์"
}, },
[2400301]={
["name"]="ค้อนสายฟ้า,ค้อนสายฟ้าผ่า,ค้อนสายฟ้าสั่น,ค้อนสายฟ้าเขย่าโลก,ค้อนสายฟ้าลงโทษ,ค้อนสายฟ้าทรงพลัง"
},
[2400302]={
["name"]="เกราะหน้าเหล็กหยาบ,เกราะหน้าเหล็กเลิศ,มงกุฎออบซิเดียน,มงกุฎกล้าหาญ,มงกุฎเขามังกร,มงกุฎนิรันดร์"
},
[2400303]={
["name"]="เสื้อยาวถักหนา,เกราะวงแหวนเหล็กบาง,เกราะหนักเหล็ก,เกราะหยกผู้แข็งแกร่ง,บุตรขุนนางเกล็ดมังกร,เกราะหนักนิรันดร์"
},
[2400304]={
["name"]="เข็มขัดหนัง,คอร์เซ็ททอง,แหวนเอวอัศวิน,คอร์เซ็ทเอ็นมังกร,ห่วงโซ่เอวนิรันดร์,สร้อยข้อมือทองแดง"
},
[2400305]={
["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์"
},
[3200101]={ [3200101]={
["name"]="หอกยาว,หอกยาวทรงพลัง,หอกยาวเจาะเกราะ,หอกยาวไม่ย่อท้อ,หอกลม,พายุยักษ์" ["name"]="หอกยาว,หอกยาวทรงพลัง,หอกยาวเจาะเกราะ,หอกยาวไม่ย่อท้อ,หอกลม,พายุยักษ์"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม"
}, },
[3400301]={
["name"]="หัวใจเสน่ห์,งดงาม,ระจุ๋มกระจิ๋ม,ดวงตาเหมือนคลื่นชดใส,ส่องแสงเหมือนดวงดาว,ความมันวาวหายไป"
},
[3400302]={
["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม"
},
[3400303]={
["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม"
},
[3400304]={
["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม"
},
[3400305]={
["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม"
},
[4200101]={ [4200101]={
["name"]="คทาวิเศษ,คทาวิเศษสวยงาม,คทาวิเศษคริสตัล,คทาวิเศษน้ำแข็ง,คทาวิเศษดาวค้าง,ดินแดนหิมะ" ["name"]="คทาวิเศษ,คทาวิเศษสวยงาม,คทาวิเศษคริสตัล,คทาวิเศษน้ำแข็ง,คทาวิเศษดาวค้าง,ดินแดนหิมะ"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม"
}, },
[4400301]={
["name"]="บอลวิเศษ,บอลวิเศษฝุ่น,บอลวิเศษมืด,บอลวิเศษรูน,บอลวิเศษสาป,หัวใจของฟาโรห์"
},
[4400302]={
["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม"
},
[4400303]={
["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม"
},
[4400304]={
["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม"
},
[4400305]={
["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม"
},
[5200101]={ [5200101]={
["name"]="ชูริเคน,ชูริเคนขนาดใหญ่,ชูริเคนกลไก,ชูริเคนลมแรง,ชูริเคนผี,ไล่ตามเงา" ["name"]="ชูริเคน,ชูริเคนขนาดใหญ่,ชูริเคนกลไก,ชูริเคนลมแรง,ชูริเคนผี,ไล่ตามเงา"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม"
},
[5400301]={
["name"]="จักร,จักรงู,จักรวงเดือน,จักรสังหาร,จักรแยกวิญญาณ,ร่องรอยจันทร์"
},
[5400302]={
["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม"
},
[5400303]={
["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม"
},
[5400304]={
["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม"
},
[5400305]={
["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="แพนด้า", ["name"]="แพนด้า",
["desc"]="แพนด้าไม่เพียงเก่งเรื่องกรงเล็บ แต่ยังประทัดอีกด้วย" ["desc"]="แพนด้าไม่เพียงเก่งเรื่องกรงเล็บ แต่ยังประทัดอีกด้วย"
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="สาวดาบ", ["name"]="สาวดาบ",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="โซล", ["name"]="โซล",
["desc"]="อยากทอดลองพลังของค้อนของเทพสายฟ้าไหม?" ["desc"]="อยากทอดลองพลังของค้อนของเทพสายฟ้าไหม?"
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="หัวหอม", ["name"]="หัวหอม",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="ฝันร้าย", ["name"]="ฝันร้าย",
["desc"]="มาสนุกกันเถอะ!" ["desc"]="มาสนุกกันเถอะ!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="หัวใจน้ำแข็ง", ["name"]="หัวใจน้ำแข็ง",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="คลีโอพัตรา", ["name"]="คลีโอพัตรา",
["desc"]="ความงามก็เป็นอาวุธชนิดหนึ่ง" ["desc"]="ความงามก็เป็นอาวุธชนิดหนึ่ง"
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="นินจาเร็น", ["name"]="นินจาเร็น",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="นักเวทแวบวับ", ["name"]="นักเวทแวบวับ",
["desc"]="ความชั่วร้ายจะจบลงที่นี่" ["desc"]="ความชั่วร้ายจะจบลงที่นี่"
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="เงามายาคอมโบ: สร้างคดาเมจสกิลเพิ่มเติมหลายครั้ง" ["desc"]="เงามายาคอมโบ: สร้างคดาเมจสกิลเพิ่มเติมหลายครั้ง"
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>คอมโบ</color>: ดาเมจเพิ่มเติมของการโจมตีทั่วไปและโต้กลับของนักเวทแวบวับที่สร้างให้กับศัตรู<color=#3cff28>คำสาป</color>เพิ่มขึ้นถึง<color=#3cff28>100%</color>" ["desc"]="<color=#fcff28>คอมโบ</color>: ดาเมจเพิ่มเติมของการโจมตีทั่วไปและโต้กลับของนักเวทแวบวับที่สร้างให้กับศัตรู<color=#3cff28>คำสาป</color>เพิ่มขึ้นถึง<color=#3cff28>100%</color>"
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35.Phòng Điều Khiển Tàu Ngầm" ["name"]="35.Phòng Điều Khiển Tàu Ngầm"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["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 Đồ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"
}, },
[1400301]={
["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"
},
[1400302]={
["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"
},
[1400303]={
["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"
},
[1400304]={
["name"]="Đai Da,Đai Than Đá,Đai Kỵ Sĩ,Đai Gân Rồng,Đai Vĩnh Hằng,Vòng Tay Đồng"
},
[1400305]={
["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"
},
[2200101]={ [2200101]={
["name"]="Đao,Đao Nanh Sói,Đao Phi Hồng,Đao Đoạn Bộc,Đao Đồ Ma,Đao Trảm Long" ["name"]="Đao,Đao Nanh Sói,Đao Phi Hồng,Đao Đoạn Bộc,Đao Đồ Ma,Đao Trảm Long"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["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 Đồ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"
}, },
[2400301]={
["name"]="Búa Lôi,Búa Chớp Điện,Búa Chấn Động,Búa Vang Trời,Búa Trừng Phạt,Búa Nhá Điện"
},
[2400302]={
["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"
},
[2400303]={
["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"
},
[2400304]={
["name"]="Đai Da,Đai Than Đá,Đai Kỵ Sĩ,Đai Gân Rồng,Đai Vĩnh Hằng,Vòng Tay Đồng"
},
[2400305]={
["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"
},
[3200101]={ [3200101]={
["name"]="Giáo,Giáo Mạnh,Giáo Phá Giáp,Giáo Bất Khuất,Giáo Cuồng Phong,Bão Cự Nhân" ["name"]="Giáo,Giáo Mạnh,Giáo Phá Giáp,Giáo Bất Khuất,Giáo Cuồng Phong,Bão Cự Nhân"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["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" ["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"
}, },
[3400301]={
["name"]="Mị Tâm,Triển Nhan,Linh Lung,Mắt Như Sóng Xanh,Tỏa Sáng Như Vì Sao,Nhật Nguyệt Mờ Ảo"
},
[3400302]={
["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"
},
[3400303]={
["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"
},
[3400304]={
["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"
},
[3400305]={
["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"
},
[4200101]={ [4200101]={
["name"]="Ma Trượng,Trượng Tinh Tế,Trượng Thủy Tinh,Trượng Hàn Băng,Trượng Sương Tinh,Tuyết Vực Băng Thiên" ["name"]="Ma Trượng,Trượng Tinh Tế,Trượng Thủy Tinh,Trượng Hàn Băng,Trượng Sương Tinh,Tuyết Vực Băng Thiên"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["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" ["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"
}, },
[4400301]={
["name"]="Bóng Phép,Bóng Phép Mông Trần,Bóng Phép Âm U,Bóng Phép Phù Văn,Bóng Phép Nguyền Rủa,Tim Pharaon"
},
[4400302]={
["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"
},
[4400303]={
["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"
},
[4400304]={
["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"
},
[4400305]={
["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"
},
[5200101]={ [5200101]={
["name"]="Shuriken ,Shuriken Lớn,Shuriken Cơ Quan,Shuriken Tật Phong,Shuriken U Linh,Truy Ảnh" ["name"]="Shuriken ,Shuriken Lớn,Shuriken Cơ Quan,Shuriken Tật Phong,Shuriken U Linh,Truy Ảnh"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["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" ["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"
},
[5400301]={
["name"]="Chakram,Vòng Hình Rắn,Vòng Nguyệt Nha,Vòng Đoạn Trường,Vòng Ly Hồn,Vết Trăng"
},
[5400302]={
["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"
},
[5400303]={
["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"
},
[5400304]={
["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"
},
[5400305]={
["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"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="Panda", ["name"]="Panda",
["desc"]="Panda không chỉ có móng vuốt lợi hại, mà còn có pháo nổ." ["desc"]="Panda không chỉ có móng vuốt lợi hại, mà còn có pháo nổ."
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="Irelia", ["name"]="Irelia",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="Thor", ["name"]="Thor",
["desc"]="Muốn nếm thử uy lực của Búa Thor không." ["desc"]="Muốn nếm thử uy lực của Búa Thor không."
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="Onion", ["name"]="Onion",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="Incubus", ["name"]="Incubus",
["desc"]="Đến tìm chút niềm vui nào!" ["desc"]="Đến tìm chút niềm vui nào!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="Frozen Heart", ["name"]="Frozen Heart",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="Cleopatra", ["name"]="Cleopatra",
["desc"]="Xinh đẹp cũng là 1 loại vũ khí." ["desc"]="Xinh đẹp cũng là 1 loại vũ khí."
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="Ninja Jay", ["name"]="Ninja Jay",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="Pháp Sư Blink", ["name"]="Pháp Sư Blink",
["desc"]="Tà ác sẽ chấm dứt tại đây." ["desc"]="Tà ác sẽ chấm dứt tại đây."
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="Ảo Ảnh Liên Kích: Gây thêm nhiều lần sát thương kỹ năng." ["desc"]="Ảo Ảnh Liên Kích: Gây thêm nhiều lần sát thương kỹ năng."
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>Combo</color>: Pháp Sư Blink đánh thường và Phản Đòn gây thêm sát thương lên kẻ địch <color=#3cff28>Lời Nguyền</color> tăng đến <color=#3cff28>100%</color>." ["desc"]="<color=#fcff28>Combo</color>: Pháp Sư Blink đánh thường và Phản Đòn gây thêm sát thương lên kẻ địch <color=#3cff28>Lời Nguyền</color> tăng đến <color=#3cff28>100%</color>."
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -103,9 +103,24 @@ local chapter = {
}, },
[35]={ [35]={
["name"]="35.潛艇控制室" ["name"]="35.潛艇控制室"
},
[36]={
},
[37]={
},
[38]={
},
[39]={
},
[40]={
} }
} }
local config = { local config = {
data=chapter,count=35 data=chapter,count=40
} }
return config return config

View File

@ -74,6 +74,21 @@ local equip = {
[1400205]={ [1400205]={
["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪" ["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪"
}, },
[1400301]={
["name"]="貓拳,尖刺貓拳,青鋼貓拳,裂傷貓拳,破空貓拳,福神之力"
},
[1400302]={
["name"]="粗鋼面甲,精鋼面盔,黑曜貴冠,英勇冠冕,龍角之冠,永恆華冠"
},
[1400303]={
["name"]="厚織長衫,薄鋼環甲,玄鐵重甲,強者玉甲,龍鱗金冑,永恆重鎧"
},
[1400304]={
["name"]="皮革腰帶,烏金束腰,騎士腰環,龍筋束腰,永恆腰鏈,銅製手環"
},
[1400305]={
["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪"
},
[2200101]={ [2200101]={
["name"]="彎刀,狼牙彎刀,飛虹刀,斷瀑刀,屠魔刀,斬龍刀" ["name"]="彎刀,狼牙彎刀,飛虹刀,斷瀑刀,屠魔刀,斬龍刀"
}, },
@ -149,6 +164,21 @@ local equip = {
[2400205]={ [2400205]={
["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪" ["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪"
}, },
[2400301]={
["name"]="雷錘,閃電雷錘,震盪雷錘,震天雷錘,罰罪雷錘,掣電雷錘"
},
[2400302]={
["name"]="粗鋼面甲,精鋼面盔,黑曜貴冠,英勇冠冕,龍角之冠,永恆華冠"
},
[2400303]={
["name"]="厚織長衫,薄鋼環甲,玄鐵重甲,強者玉甲,龍鱗金冑,永恆重鎧"
},
[2400304]={
["name"]="皮革腰帶,烏金束腰,騎士腰環,龍筋束腰,永恆腰鏈,銅製手環"
},
[2400305]={
["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪"
},
[3200101]={ [3200101]={
["name"]="長槍,強力長槍,破甲長槍,不屈長槍,狂風之槍,巨人風暴" ["name"]="長槍,強力長槍,破甲長槍,不屈長槍,狂風之槍,巨人風暴"
}, },
@ -224,6 +254,21 @@ local equip = {
[3400205]={ [3400205]={
["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲"
}, },
[3400301]={
["name"]="魅心,展顏,玲瓏,眸若碧波,燦若繁星,日月失輝"
},
[3400302]={
["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠"
},
[3400303]={
["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍"
},
[3400304]={
["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索"
},
[3400305]={
["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲"
},
[4200101]={ [4200101]={
["name"]="魔杖,精緻魔杖,水晶魔杖,寒冰魔杖,霜星魔杖,雪域冰天" ["name"]="魔杖,精緻魔杖,水晶魔杖,寒冰魔杖,霜星魔杖,雪域冰天"
}, },
@ -299,6 +344,21 @@ local equip = {
[4400205]={ [4400205]={
["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲"
}, },
[4400301]={
["name"]="法球,蒙塵法球,黯光法球,符文法球,詛咒法球,法老之心"
},
[4400302]={
["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠"
},
[4400303]={
["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍"
},
[4400304]={
["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索"
},
[4400305]={
["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲"
},
[5200101]={ [5200101]={
["name"]="手裏劍,大型手裏劍,機關手裏劍,疾風手裏劍,幽靈手裏劍,追影" ["name"]="手裏劍,大型手裏劍,機關手裏劍,疾風手裏劍,幽靈手裏劍,追影"
}, },
@ -373,9 +433,24 @@ local equip = {
}, },
[5400205]={ [5400205]={
["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲"
},
[5400301]={
["name"]="環刃,蛇形環,月牙環,斷腸環,離魂環,月痕"
},
[5400302]={
["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠"
},
[5400303]={
["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍"
},
[5400304]={
["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索"
},
[5400305]={
["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲"
} }
} }
local config = { local config = {
data=equip,count=125 data=equip,count=150
} }
return config return config

View File

@ -18,6 +18,9 @@ local hero = {
[14002]={ [14002]={
["name"]="潘達", ["name"]="潘達",
["desc"]="潘達厲害的可不止爪子,還有鞭炮。" ["desc"]="潘達厲害的可不止爪子,還有鞭炮。"
},
[14003]={
}, },
[22001]={ [22001]={
["name"]="刀妹", ["name"]="刀妹",
@ -38,6 +41,9 @@ local hero = {
[24002]={ [24002]={
["name"]="索爾", ["name"]="索爾",
["desc"]="想試試雷神之鎚的威力嗎。" ["desc"]="想試試雷神之鎚的威力嗎。"
},
[24003]={
}, },
[32001]={ [32001]={
["name"]="洋蔥頭", ["name"]="洋蔥頭",
@ -58,6 +64,9 @@ local hero = {
[34002]={ [34002]={
["name"]="夢魔", ["name"]="夢魔",
["desc"]="來找點樂子吧!" ["desc"]="來找點樂子吧!"
},
[34003]={
}, },
[42001]={ [42001]={
["name"]="冰心", ["name"]="冰心",
@ -78,6 +87,9 @@ local hero = {
[44002]={ [44002]={
["name"]="豔后", ["name"]="豔后",
["desc"]="美麗也是一種武器。" ["desc"]="美麗也是一種武器。"
},
[44003]={
}, },
[52001]={ [52001]={
["name"]="忍者倫", ["name"]="忍者倫",
@ -98,9 +110,12 @@ local hero = {
[54002]={ [54002]={
["name"]="閃爍法師", ["name"]="閃爍法師",
["desc"]="邪惡在此終結。" ["desc"]="邪惡在此終結。"
},
[54003]={
} }
} }
local config = { local config = {
data=hero,count=25 data=hero,count=30
} }
return config return config

View File

@ -73,9 +73,24 @@ local skill = {
}, },
[5400220]={ [5400220]={
["desc"]="幻影連擊:額外造成數次技能傷害。" ["desc"]="幻影連擊:額外造成數次技能傷害。"
},
[1400320]={
},
[2400320]={
},
[3400320]={
},
[4400320]={
},
[5400320]={
} }
} }
local config = { local config = {
data=skill,count=25 data=skill,count=30
} }
return config return config

View File

@ -730,9 +730,129 @@ local skill_rogue = {
}, },
[5400207]={ [5400207]={
["desc"]="<color=#fcff28>Combo</color>:閃爍法師普攻和反擊對<color=#3cff28>詛咒</color>敵人額外造成傷害提高至<color=#3cff28>100%</color>。" ["desc"]="<color=#fcff28>Combo</color>:閃爍法師普攻和反擊對<color=#3cff28>詛咒</color>敵人額外造成傷害提高至<color=#3cff28>100%</color>。"
},
[1400300]={
},
[1400301]={
},
[1400302]={
},
[1400303]={
},
[1400304]={
},
[1400305]={
},
[1400306]={
},
[1400307]={
},
[2400300]={
},
[2400301]={
},
[2400302]={
},
[2400303]={
},
[2400304]={
},
[2400305]={
},
[2400306]={
},
[2400307]={
},
[3400300]={
},
[3400301]={
},
[3400302]={
},
[3400303]={
},
[3400304]={
},
[3400305]={
},
[3400306]={
},
[3400307]={
},
[4400300]={
},
[4400301]={
},
[4400302]={
},
[4400303]={
},
[4400304]={
},
[4400305]={
},
[4400306]={
},
[4400307]={
},
[5400300]={
},
[5400301]={
},
[5400302]={
},
[5400303]={
},
[5400304]={
},
[5400305]={
},
[5400306]={
},
[5400307]={
} }
} }
local config = { local config = {
data=skill_rogue,count=244 data=skill_rogue,count=284
} }
return config return config

View File

@ -468,6 +468,15 @@ GConst.HERO_FRAME_BG_QLT = {
[7] = "hero_frame_bg_7", [7] = "hero_frame_bg_7",
} }
GConst.QLT_COLOR = {
[1] = "#aef1ff",
[2] = "#9aff9cz",
[3] = "#aef1ff",
[4] = "#f6aeff",
[5] = "#f6aeff",
[6] = "#f6aeff",
}
GConst.QLT_LABLE = { GConst.QLT_LABLE = {
DEFAULT = "equip_quality_1", DEFAULT = "equip_quality_1",
GRAY = "equip_quality_1", GRAY = "equip_quality_1",

View File

@ -12,15 +12,27 @@ function CollectionManager:rspHeroPoint(result)
end end
end end
-- 请求领取英雄图鉴奖励 -- 请求领取皮肤图鉴点数
function CollectionManager:reqHeroPointReward() function CollectionManager:reqSkinPoint(id)
self:sendMessage(ProtoMsgType.FromMsgEnum.HeroCollectionUpgradeReq, {}, {}, self.rspHeroPointReward, BIReport.ITEM_GET_TYPE.COLLECTION_HERO_REWARD) self:sendMessage(ProtoMsgType.FromMsgEnum.SkinCollectionPointReq, {skin_id = id}, {}, self.rspSkinPoint)
end end
function CollectionManager:rspHeroPointReward(result) function CollectionManager:rspSkinPoint(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.CollectionData:onGetedPointSuccess(GConst.CollectionConst.TYPE.SKIN, result.reqData.skin_id, result.point)
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.COLLECTION_GET_POINT_SUCCESS)
end
end
-- 请求领取图鉴奖励
function CollectionManager:reqPointReward()
self:sendMessage(ProtoMsgType.FromMsgEnum.CollectionUpgradeReq, {}, {}, self.rspPointReward, BIReport.ITEM_GET_TYPE.COLLECTION_HERO_REWARD)
end
function CollectionManager:rspPointReward(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
GFunc.showRewardBox(result.rewards) GFunc.showRewardBox(result.rewards)
DataManager.CollectionData:onGetedPointRewardSuccess(GConst.CollectionConst.TYPE.HERO) DataManager.CollectionData:onGetedPointRewardSuccess()
end end
end end

View File

@ -9,19 +9,4 @@ EquipConst.PART_TYPE = {
HANDGUARD = 5 HANDGUARD = 5
} }
-- 界面类型
EquipConst.PANEL_TYPE = {
HERO = 1,
WEAPON = 2,
ARMOR = 3,
}
-- 加成属性类型
EquipConst.ATTR_TYPE = {
HP = 1,
ATK = 2,
NORMAL_HURT = 3,
SKILL_HURT = 4,
}
return EquipConst return EquipConst

View File

@ -54,15 +54,22 @@ HeroConst.ATTR_SHOW_ARMOR = {
HeroConst.ATTR_SHOW_SKIN = { HeroConst.ATTR_SHOW_SKIN = {
GConst.MATCH_HP_NAME, -- 生命 GConst.MATCH_HP_NAME, -- 生命
GConst.MATCH_ATTACK_NAME, -- 攻击 GConst.MATCH_ATTACK_NAME, -- 攻击
GConst.MATCH_NORMAL_HURT_NAME, -- 普攻增伤
GConst.MATCH_SKILL_HURT_NAME, -- 技能增伤
GConst.MATCH_CRIT_NAME, -- 暴击率百分比
GConst.MATCH_CRIT_TIME_NAME, -- 暴击伤害百分比
GConst.MATCH_NORMAL_HURTP_NAME, -- 普攻增伤百分比
GConst.MATCH_SKILL_HURTP_NAME, -- 技能增伤百分比
GConst.MATCH_CURED_NAME, -- 治疗效果提升百分比
} }
-- 需要显示属性的模块 -- 需要显示属性的模块
HeroConst.SHOW_NODE = HeroConst.SHOW_NODE = {
{
HeroConst.ATTR_SHOW_TOTAL, HeroConst.ATTR_SHOW_TOTAL,
HeroConst.ATTR_SHOW_BASE, HeroConst.ATTR_SHOW_BASE,
HeroConst.ATTR_SHOW_WEAPON, HeroConst.ATTR_SHOW_WEAPON,
HeroConst.ATTR_SHOW_ARMOR, HeroConst.ATTR_SHOW_ARMOR,
HeroConst.ATTR_SHOW_SKIN,
} }
HeroConst.TRIAL_HERO_ID = 34001 -- 花木兰 HeroConst.TRIAL_HERO_ID = 34001 -- 花木兰

View File

@ -38,7 +38,11 @@ end
------------------------------------------ 英雄相关的工具方法 ------------------------------ ------------------------------------------ 英雄相关的工具方法 ------------------------------
function HeroManager:getHeroName(id, needColor) function HeroManager:getHeroName(id, needColor)
local name = I18N:getConfig("hero")[id].name local cfg = I18N:getConfig("hero")[id]
if cfg == nil then
return "not find:"..id
end
local name = cfg.name
if name and needColor then if name and needColor then
local color = GConst.BattleConst.ELEMENT_COLOR[self:getHeroMatchType(id)] local color = GConst.BattleConst.ELEMENT_COLOR[self:getHeroMatchType(id)]
if color then if color then
@ -49,7 +53,11 @@ function HeroManager:getHeroName(id, needColor)
end end
function HeroManager:getHeroDesc(id) function HeroManager:getHeroDesc(id)
return I18N:getConfig("hero")[id].desc local cfg = I18N:getConfig("hero")[id]
if cfg == nil then
return "not find:"..id
end
return cfg.desc
end end
function HeroManager:getHeroIcon(heroId) function HeroManager:getHeroIcon(heroId)

View File

@ -27,6 +27,7 @@ ItemConst.ITEM_TYPE = {
RANDOM_BOX_ITEM = 7, RANDOM_BOX_ITEM = 7,
FIXED_BOX_ITEM = 8, FIXED_BOX_ITEM = 8,
EPIC_HERO_FRAMENT = 11, EPIC_HERO_FRAMENT = 11,
SKIN = 12
} }
return ItemConst return ItemConst

8
lua/app/module/skin.meta Normal file
View File

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

View File

@ -0,0 +1,35 @@
local SkinManager = class("SkinManager", BaseModule)
function SkinManager:init()
self:addEventListener(EventManager.CUSTOM_EVENT.GETED_REWARD_SUCCESS, function(rewards)
Logger.logHighlight("奖励获取")
Logger.printTable(rewards)
self:checkUnlockSkin(rewards)
end)
end
-- 检查解锁皮肤
function SkinManager:checkUnlockSkin(checkData)
if type(checkData) ~= "table" then
return
end
for index, reward in ipairs(checkData) do
if reward.type == GConst.REWARD_TYPE.ITEM and reward.item.type == GConst.ItemConst.ITEM_TYPE.SKIN then
DataManager.SkinData:onUnlockSkin(reward.item.id)
end
end
end
-- 使用皮肤
function SkinManager:reqChangeSkin(heroId, skinId)
self:sendMessage(ProtoMsgType.FromMsgEnum.HeroChangeSkinReq, {id = heroId, skin_id = skinId}, {}, self.rspChangeSkin)
end
function SkinManager:rspChangeSkin(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then
DataManager.HeroData:getHeroById(result.reqData.id):onChangeSkin(result.reqData.skin_id)
end
end
return SkinManager

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5f7fd6b82afd7a447a1abafe52103641 guid: 52b42c16b774c764d97de9262d74ed19
ScriptedImporter: ScriptedImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

View File

@ -41,6 +41,8 @@ local ProtoMsgType = {
[850672724] = "SummerBountyClaimByDiamondRsp", [850672724] = "SummerBountyClaimByDiamondRsp",
[904222760] = "ArenaBountyLevelUnlockReq", [904222760] = "ArenaBountyLevelUnlockReq",
[904224593] = "ArenaBountyLevelUnlockRsp", [904224593] = "ArenaBountyLevelUnlockRsp",
[965540816] = "CollectionUpgradeReq",
[965542649] = "CollectionUpgradeRsp",
[1008447203] = "DeleteReq", [1008447203] = "DeleteReq",
[1008449036] = "DeleteRsp", [1008449036] = "DeleteRsp",
[1067411524] = "BuyTicketReq", [1067411524] = "BuyTicketReq",
@ -77,8 +79,6 @@ local ProtoMsgType = {
[1746319121] = "IdleInfoRsp", [1746319121] = "IdleInfoRsp",
[1751460231] = "PVPHeroesArrayReq", [1751460231] = "PVPHeroesArrayReq",
[1751462064] = "PVPHeroesArrayRsp", [1751462064] = "PVPHeroesArrayRsp",
[1870101082] = "HeroCollectionUpgradeReq",
[1870102915] = "HeroCollectionUpgradeRsp",
[1901321540] = "PipedReq", [1901321540] = "PipedReq",
[2060508030] = "ChangeAvatarFrameReq", [2060508030] = "ChangeAvatarFrameReq",
[2060509863] = "ChangeAvatarFrameRsp", [2060509863] = "ChangeAvatarFrameRsp",
@ -186,6 +186,8 @@ local ProtoMsgType = {
[3763119103] = "HeartbeatRsp", [3763119103] = "HeartbeatRsp",
[3805364358] = "EquipUpgradeReq", [3805364358] = "EquipUpgradeReq",
[3805366191] = "EquipUpgradeRsp", [3805366191] = "EquipUpgradeRsp",
[3851969243] = "HeroChangeSkinReq",
[3851971076] = "HeroChangeSkinRsp",
[3904148760] = "GMReq", [3904148760] = "GMReq",
[3904150593] = "GMRsp", [3904150593] = "GMRsp",
[3933875617] = "ChapterStartReq", [3933875617] = "ChapterStartReq",
@ -194,6 +196,8 @@ local ProtoMsgType = {
[4106157842] = "BountyLevelUnlockRsp", [4106157842] = "BountyLevelUnlockRsp",
[4133057746] = "ChapterGoldChallengeFarmReq", [4133057746] = "ChapterGoldChallengeFarmReq",
[4133059579] = "ChapterGoldChallengeFarmRsp", [4133059579] = "ChapterGoldChallengeFarmRsp",
[4149362837] = "SkinCollectionPointReq",
[4149364670] = "SkinCollectionPointRsp",
[4152754481] = "PVPChallengeStartReq", [4152754481] = "PVPChallengeStartReq",
[4152756314] = "PVPChallengeStartRsp", [4152756314] = "PVPChallengeStartRsp",
[4155165814] = "SummerTaskClaimReq", [4155165814] = "SummerTaskClaimReq",
@ -243,6 +247,8 @@ local ProtoMsgType = {
SummerBountyClaimByDiamondRsp = 850672724, SummerBountyClaimByDiamondRsp = 850672724,
ArenaBountyLevelUnlockReq = 904222760, ArenaBountyLevelUnlockReq = 904222760,
ArenaBountyLevelUnlockRsp = 904224593, ArenaBountyLevelUnlockRsp = 904224593,
CollectionUpgradeReq = 965540816,
CollectionUpgradeRsp = 965542649,
DeleteReq = 1008447203, DeleteReq = 1008447203,
DeleteRsp = 1008449036, DeleteRsp = 1008449036,
BuyTicketReq = 1067411524, BuyTicketReq = 1067411524,
@ -279,8 +285,6 @@ local ProtoMsgType = {
IdleInfoRsp = 1746319121, IdleInfoRsp = 1746319121,
PVPHeroesArrayReq = 1751460231, PVPHeroesArrayReq = 1751460231,
PVPHeroesArrayRsp = 1751462064, PVPHeroesArrayRsp = 1751462064,
HeroCollectionUpgradeReq = 1870101082,
HeroCollectionUpgradeRsp = 1870102915,
PipedReq = 1901321540, PipedReq = 1901321540,
ChangeAvatarFrameReq = 2060508030, ChangeAvatarFrameReq = 2060508030,
ChangeAvatarFrameRsp = 2060509863, ChangeAvatarFrameRsp = 2060509863,
@ -388,6 +392,8 @@ local ProtoMsgType = {
HeartbeatRsp = 3763119103, HeartbeatRsp = 3763119103,
EquipUpgradeReq = 3805364358, EquipUpgradeReq = 3805364358,
EquipUpgradeRsp = 3805366191, EquipUpgradeRsp = 3805366191,
HeroChangeSkinReq = 3851969243,
HeroChangeSkinRsp = 3851971076,
GMReq = 3904148760, GMReq = 3904148760,
GMRsp = 3904150593, GMRsp = 3904150593,
ChapterStartReq = 3933875617, ChapterStartReq = 3933875617,
@ -396,6 +402,8 @@ local ProtoMsgType = {
BountyLevelUnlockRsp = 4106157842, BountyLevelUnlockRsp = 4106157842,
ChapterGoldChallengeFarmReq = 4133057746, ChapterGoldChallengeFarmReq = 4133057746,
ChapterGoldChallengeFarmRsp = 4133059579, ChapterGoldChallengeFarmRsp = 4133059579,
SkinCollectionPointReq = 4149362837,
SkinCollectionPointRsp = 4149364670,
PVPChallengeStartReq = 4152754481, PVPChallengeStartReq = 4152754481,
PVPChallengeStartRsp = 4152756314, PVPChallengeStartRsp = 4152756314,
SummerTaskClaimReq = 4155165814, SummerTaskClaimReq = 4155165814,
@ -445,6 +453,8 @@ local ProtoMsgType = {
SummerBountyClaimByDiamondRsp = "SummerBountyClaimByDiamondRsp", SummerBountyClaimByDiamondRsp = "SummerBountyClaimByDiamondRsp",
ArenaBountyLevelUnlockReq = "ArenaBountyLevelUnlockReq", ArenaBountyLevelUnlockReq = "ArenaBountyLevelUnlockReq",
ArenaBountyLevelUnlockRsp = "ArenaBountyLevelUnlockRsp", ArenaBountyLevelUnlockRsp = "ArenaBountyLevelUnlockRsp",
CollectionUpgradeReq = "CollectionUpgradeReq",
CollectionUpgradeRsp = "CollectionUpgradeRsp",
DeleteReq = "DeleteReq", DeleteReq = "DeleteReq",
DeleteRsp = "DeleteRsp", DeleteRsp = "DeleteRsp",
BuyTicketReq = "BuyTicketReq", BuyTicketReq = "BuyTicketReq",
@ -481,8 +491,6 @@ local ProtoMsgType = {
IdleInfoRsp = "IdleInfoRsp", IdleInfoRsp = "IdleInfoRsp",
PVPHeroesArrayReq = "PVPHeroesArrayReq", PVPHeroesArrayReq = "PVPHeroesArrayReq",
PVPHeroesArrayRsp = "PVPHeroesArrayRsp", PVPHeroesArrayRsp = "PVPHeroesArrayRsp",
HeroCollectionUpgradeReq = "HeroCollectionUpgradeReq",
HeroCollectionUpgradeRsp = "HeroCollectionUpgradeRsp",
PipedReq = "PipedReq", PipedReq = "PipedReq",
ChangeAvatarFrameReq = "ChangeAvatarFrameReq", ChangeAvatarFrameReq = "ChangeAvatarFrameReq",
ChangeAvatarFrameRsp = "ChangeAvatarFrameRsp", ChangeAvatarFrameRsp = "ChangeAvatarFrameRsp",
@ -590,6 +598,8 @@ local ProtoMsgType = {
HeartbeatRsp = "HeartbeatRsp", HeartbeatRsp = "HeartbeatRsp",
EquipUpgradeReq = "EquipUpgradeReq", EquipUpgradeReq = "EquipUpgradeReq",
EquipUpgradeRsp = "EquipUpgradeRsp", EquipUpgradeRsp = "EquipUpgradeRsp",
HeroChangeSkinReq = "HeroChangeSkinReq",
HeroChangeSkinRsp = "HeroChangeSkinRsp",
GMReq = "GMReq", GMReq = "GMReq",
GMRsp = "GMRsp", GMRsp = "GMRsp",
ChapterStartReq = "ChapterStartReq", ChapterStartReq = "ChapterStartReq",
@ -598,6 +608,8 @@ local ProtoMsgType = {
BountyLevelUnlockRsp = "BountyLevelUnlockRsp", BountyLevelUnlockRsp = "BountyLevelUnlockRsp",
ChapterGoldChallengeFarmReq = "ChapterGoldChallengeFarmReq", ChapterGoldChallengeFarmReq = "ChapterGoldChallengeFarmReq",
ChapterGoldChallengeFarmRsp = "ChapterGoldChallengeFarmRsp", ChapterGoldChallengeFarmRsp = "ChapterGoldChallengeFarmRsp",
SkinCollectionPointReq = "SkinCollectionPointReq",
SkinCollectionPointRsp = "SkinCollectionPointRsp",
PVPChallengeStartReq = "PVPChallengeStartReq", PVPChallengeStartReq = "PVPChallengeStartReq",
PVPChallengeStartRsp = "PVPChallengeStartRsp", PVPChallengeStartRsp = "PVPChallengeStartRsp",
SummerTaskClaimReq = "SummerTaskClaimReq", SummerTaskClaimReq = "SummerTaskClaimReq",

View File

@ -0,0 +1,147 @@
local CollectionCell = class("CollectionCell", BaseCell)
function CollectionCell:init()
local uiMap = self:getUIMap()
self.imgQlt = uiMap["collection_cell.img_qlt"]
self.imgType = uiMap["collection_cell.img_qlt.img_type"]
self.imgS = uiMap["collection_cell.img_s"]
self.txLevel = uiMap["collection_cell.tx_level"]
self.txName = uiMap["collection_cell.tx_name"]
self.txMax = uiMap["collection_cell.tx_max"]
self.btnCollect = uiMap["collection_cell.btn_collect"]
self.imgIcon = uiMap["collection_cell.btn_collect.img_icon"]
self.txValue = uiMap["collection_cell.btn_collect.tx_value"]
self.spineRoot = uiMap["collection_cell.spine_root.spine_hero"]
self.btnCollect:addClickListener(function()
if self.collectionType == GConst.CollectionConst.TYPE.HERO then
self:onClickCollectionHero()
elseif self.collectionType == GConst.CollectionConst.TYPE.SKIN then
self:onClickCollectionSkin()
end
end)
self:bind(DataManager.CollectionData, "isDirty", function()
self:refresh()
end)
end
function CollectionCell:onClickCollectionHero()
if DataManager.CollectionData:getCanCollectPoint(GConst.CollectionConst.TYPE.HERO, self.collectionData.id) > 0 then
AudioManager:playEffect(AudioManager.EFFECT_ID.STAR_GET)
ModuleManager.CollectionManager:reqHeroPoint(self.collectionData.id)
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.COLLECTION_CLICK_GET_POINT, self.imgIcon:getPosition())
else
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_12))
end
end
function CollectionCell:onClickCollectionSkin()
if DataManager.SkinData:isUnlock(self.collectionData.id) and DataManager.CollectionData:getCanCollectPoint(GConst.CollectionConst.TYPE.SKIN, self.collectionData.id) > 0 then
ModuleManager.CollectionManager:reqSkinPoint(self.collectionData.id)
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.COLLECTION_CLICK_GET_POINT, self.imgIcon:getPosition())
else
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.SKIN_GOT_TIPS))
end
end
function CollectionCell:refresh(type, data)
self.collectionType = type or self.collectionType
self.collectionData = data or self.collectionData
if self.collectionType == GConst.CollectionConst.TYPE.HERO then
self:showHero()
elseif self.collectionType == GConst.CollectionConst.TYPE.SKIN then
self:showSkin()
end
end
-- 展示英雄收集
function CollectionCell:showHero()
local heroEntity = DataManager.HeroData:getHeroById(self.collectionData.id)
SpineManager:loadHeroAsync(heroEntity:getModelId(), self.spineRoot, function(spineObject)
if self.spineHero then
self.spineHero:destroy()
self.spineHero = nil
end
spineObject:setDefaultMix(0)
self.spineHero = spineObject
end)
self.imgS:setActive(false)
self.txLevel:setActive(true)
self.baseObject:setSprite(GConst.ATLAS_PATH.HERO, GConst.HERO_FRAME_QLT[self.collectionData.qlt])
self.imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.HERO_FRAME_BG_QLT[self.collectionData.qlt])
self.imgType:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[self.collectionData.position], function()
self.imgType:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
end)
self.txName:setText(ModuleManager.HeroManager:getHeroName(self.collectionData.id))
self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()))
self.txMax:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_2))
-- 刷新点数状态
local canGetValue = DataManager.CollectionData:getCanCollectPoint(GConst.CollectionConst.TYPE.HERO, self.collectionData.id)
-- Logger.logHighlight("id:"..self.collectionData.id..",level:"..heroEntity:getLv()..",canGetValue:"..canGetValue)
if canGetValue > 0 then
self.txValue:setText("+" .. canGetValue)
self.txLevel:setText("<color=#FCFF13>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()).."</color>")
GFunc.getShakeSeq(self.txLevel, false, 1, true)
self.btnCollect:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_3")
self.btnCollect:setActive(true)
self.txMax:setActive(false)
else
self.txValue:setText("+" .. heroEntity:getCollectionPoint())
self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()))
GFunc.getShakeSeq(self.txLevel, true)
self.btnCollect:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_3")
self.btnCollect:setActive(not heroEntity:isMaxLv())
self.txMax:setActive(heroEntity:isMaxLv())
end
GFunc.centerTxAndImg(self.txValue, self.imgIcon, 2)
end
-- 展示皮肤收集
function CollectionCell:showSkin()
SpineManager:loadHeroAsync(DataManager.SkinData:getModelId(self.collectionData.id), self.spineRoot, function(spineObject)
if self.spineHero then
self.spineHero:destroy()
self.spineHero = nil
end
spineObject:setDefaultMix(0)
self.spineHero = spineObject
end)
self.imgS:setActive(self.collectionData.qlt >= 4)
self.txLevel:setActive(false)
self.baseObject:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_frame_"..self.collectionData.qlt)
self.imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.HERO_FRAME_BG_QLT[self.collectionData.qlt])
self.imgType:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_"..self.collectionData.qlt, function()
self.imgType:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
end)
self.txName:setText(ModuleManager.HeroManager:getHeroName(self.collectionData.id))
self.txMax:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_DONE))
-- 刷新点数状态
local canGetValue = DataManager.CollectionData:getCanCollectPoint(GConst.CollectionConst.TYPE.SKIN, self.collectionData.id)
-- Logger.logHighlight("id:"..self.collectionData.id..",canGetValue:"..canGetValue)
if DataManager.SkinData:isUnlock(self.collectionData.id) then
if canGetValue > 0 then
-- 已解锁,未领点数
self.txMax:setActive(false)
self.btnCollect:setActive(true)
self.btnCollect:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_3")
self.txValue:setText("+" .. canGetValue)
else
-- 已解锁,已领点数
self.btnCollect:setActive(false)
self.txMax:setActive(true)
end
else
-- 未解锁
self.txMax:setActive(false)
self.btnCollect:setActive(true)
self.btnCollect:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_3")
self.txValue:setText("+" .. canGetValue)
end
GFunc.centerTxAndImg(self.txValue, self.imgIcon, 2)
end
return CollectionCell

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: ae283986db9430a4c93e36cf10c35276 guid: 718e6942d66e6af45b581dc3b26f7687
ScriptedImporter: ScriptedImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

View File

@ -1,79 +0,0 @@
local CollectionHeroCell = class("CollectionHeroCell", BaseCell)
function CollectionHeroCell:init()
local uiMap = self:getUIMap()
self.imgQlt = uiMap["collection_hero_cell.img_qlt"]
self.imgType = uiMap["collection_hero_cell.img_qlt.img_type"]
self.txLevel = uiMap["collection_hero_cell.tx_level"]
self.txName = uiMap["collection_hero_cell.tx_name"]
self.txMax = uiMap["collection_hero_cell.tx_max"]
self.btnCollect = uiMap["collection_hero_cell.btn_collect"]
self.imgIcon = uiMap["collection_hero_cell.btn_collect.img_icon"]
self.txValue = uiMap["collection_hero_cell.btn_collect.tx_value"]
self.spineRoot = uiMap["collection_hero_cell.spine_root.spine_hero"]
self.btnCollect:addClickListener(function()
if DataManager.CollectionData:getCanCollectPoint(GConst.CollectionConst.TYPE.HERO, self.heroData.id) > 0 then
AudioManager:playEffect(AudioManager.EFFECT_ID.STAR_GET)
ModuleManager.CollectionManager:reqHeroPoint(self.heroData.id)
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.COLLECTION_CLICK_GET_POINT, self.imgIcon:getPosition())
else
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_12))
end
end)
self:bind(DataManager.CollectionData, "dirtyHero", function()
self:refreshCollectPoint()
end)
end
function CollectionHeroCell:refresh(data)
self.heroData = data
local entity = DataManager.HeroData:getHeroById(self.heroData.id)
SpineManager:loadHeroAsync(entity:getModelId(), self.spineRoot, function(spineObject)
if self.spineHero then
self.spineHero:destroy()
self.spineHero = nil
end
spineObject:setDefaultMix(0)
self.spineHero = spineObject
end)
self.baseObject:setSprite(GConst.ATLAS_PATH.HERO, GConst.HERO_FRAME_QLT[self.heroData.qlt])
self.imgQlt:setSprite(GConst.ATLAS_PATH.HERO, GConst.HERO_FRAME_BG_QLT[self.heroData.qlt])
self.imgType:setSprite(GConst.ATLAS_PATH.ICON_HERO, GConst.HeroConst.MATCH_ICON_NAME[self.heroData.position])
self.txName:setText(ModuleManager.HeroManager:getHeroName(self.heroData.id))
local heroEntity = DataManager.HeroData:getHeroById(self.heroData.id)
if heroEntity then
self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()))
else
self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, 0))
end
self.txMax:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_2))
self:refreshCollectPoint()
end
-- 刷新收集点数状态
function CollectionHeroCell:refreshCollectPoint()
local canGetValue = DataManager.CollectionData:getCanCollectPoint(GConst.CollectionConst.TYPE.HERO, self.heroData.id)
local heroEntity = DataManager.HeroData:getHeroById(self.heroData.id)
-- Logger.logHighlight("id:"..self.heroData.id..",level:"..heroEntity:getLv()..",canGetValue:"..canGetValue)
if canGetValue > 0 then
self.txValue:setText("+" .. canGetValue)
self.txLevel:setText("<color=#FCFF13>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()).."</color>")
GFunc.getShakeSeq(self.txLevel, false, 1, true)
self.btnCollect:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_3")
self.btnCollect:setActive(true)
self.txMax:setActive(false)
else
self.txValue:setText("+" .. heroEntity:getCollectionPoint())
self.txLevel:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()))
GFunc.getShakeSeq(self.txLevel, true)
self.btnCollect:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_3")
self.btnCollect:setActive(not heroEntity:isMaxLv())
self.txMax:setActive(heroEntity:isMaxLv())
end
GFunc.centerTxAndImg(self.txValue, self.imgIcon, 2)
end
return CollectionHeroCell

View File

@ -17,20 +17,20 @@ function CollectionRewardCell:init()
end end
function CollectionRewardCell:refresh(collectionType, id) function CollectionRewardCell:refresh(collectionType, id)
local curPoint = DataManager.CollectionData:getCurCollectPoint(collectionType) local curPoint = DataManager.CollectionData:getCurCollectPoint()
local rewardList = DataManager.CollectionData:getRewardList(collectionType)[id] local rewardList = DataManager.CollectionData:getRewardList()[id]
self.txValue:setText(rewardList.point) self.txValue:setText(rewardList.point)
self.txTag:setText(curPoint) self.txTag:setText(curPoint)
local prog = DataManager.CollectionData:getRewardTargetProgress(collectionType, id) local prog = DataManager.CollectionData:getRewardTargetProgress(id)
if DataManager.CollectionData:getCurTargetId(collectionType) == id then if DataManager.CollectionData:getCurTargetId() == id then
self.imgProg.value = prog self.imgProg.value = prog
self.tagProg:setVisible(true) self.tagProg:setVisible(true)
-- 高度超框处理 -- 高度超框处理
local rootHeight = self.baseObject:fastGetSizeDeltaY() local rootHeight = self.baseObject:fastGetSizeDeltaY()
local posY = rootHeight * prog local posY = rootHeight * prog
if id == 1 or id == #DataManager.CollectionData:getRewardList(collectionType) then if id == 1 or id == #DataManager.CollectionData:getRewardList() then
local tagHeight = self.tagProg:fastGetSizeDeltaY() local tagHeight = self.tagProg:fastGetSizeDeltaY()
if posY < tagHeight / 2 then if posY < tagHeight / 2 then
posY = tagHeight / 2 posY = tagHeight / 2
@ -42,7 +42,7 @@ function CollectionRewardCell:refresh(collectionType, id)
self.tagProg:setVisible(false) self.tagProg:setVisible(false)
end end
if DataManager.CollectionData:isRewardReceived(collectionType, id) then if DataManager.CollectionData:isRewardReceived(id) then
self.maskReward:setVisible(false) self.maskReward:setVisible(false)
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_5)) self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_5))
else else

View File

@ -39,7 +39,7 @@ function CollectionRewardUI:onLoadRootComplete()
end end
function CollectionRewardUI:onRefresh() function CollectionRewardUI:onRefresh()
local datas = DataManager.CollectionData:getRewardList(self.collectType) local datas = DataManager.CollectionData:getRewardList()
self.scrollrectComp:addInitCallback(function() self.scrollrectComp:addInitCallback(function()
return "app/ui/collection/cell/collection_reward_cell" return "app/ui/collection/cell/collection_reward_cell"
end) end)
@ -48,7 +48,7 @@ function CollectionRewardUI:onRefresh()
end) end)
self.scrollrectComp:clearCells() self.scrollrectComp:clearCells()
self.scrollrectComp:refillCells(#datas) self.scrollrectComp:refillCells(#datas)
local selectIdx = DataManager.CollectionData:getCurTargetId(self.collectType) local selectIdx = DataManager.CollectionData:getCurTargetId()
if selectIdx - 2 >= 0 then if selectIdx - 2 >= 0 then
selectIdx = selectIdx - 2 selectIdx = selectIdx - 2
end end

View File

@ -53,14 +53,29 @@ function CollectionUI:onLoadRootComplete()
self.imgProg = uiMap["collect_ui.rewards.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) self.imgProg = uiMap["collect_ui.rewards.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER)
self.btnRewards = uiMap["collection_ui.rewards.point"] self.btnRewards = uiMap["collection_ui.rewards.point"]
self.flyIcon = uiMap["collection_ui.fly_icon"] self.flyIcon = uiMap["collection_ui.fly_icon"]
-- 英雄
self.btnHero = uiMap["collection_ui.banner.btn_hero"]
self.selectHero = uiMap["collection_ui.banner.btn_hero.select"]
self.txHero = uiMap["collection_ui.banner.btn_hero.tx_hero"]
-- 皮肤
self.btnSkin = uiMap["collection_ui.banner.btn_skin"]
self.selectSkin = uiMap["collection_ui.banner.btn_skin.select"]
self.txSkin = uiMap["collection_ui.banner.btn_skin.tx_skin"]
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_1)) self.txHero:setText(I18N:getGlobalText(I18N.GlobalConst.MAIN_BTN_2))
self.txSkin:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN))
self.scrollrectComp:addInitCallback(function()
return "app/ui/collection/cell/collection_cell"
end)
self.scrollrectComp:addRefreshCallback(function(index, cell)
cell:refresh(self.collectType, self.collectList[index])
end)
self.btnRewards:addClickListener(function() self.btnRewards:addClickListener(function()
UIManager:showUI("app/ui/collection/collection_reward_ui", self.collectType) UIManager:showUI("app/ui/collection/collection_reward_ui", self.collectType)
end) end)
self.btnGet:addClickListener(function() self.btnGet:addClickListener(function()
ModuleManager.CollectionManager:reqHeroPointReward() ModuleManager.CollectionManager:reqPointReward()
end) end)
self.btnClose:addClickListener(function() self.btnClose:addClickListener(function()
self:closeUI() self:closeUI()
@ -73,7 +88,13 @@ function CollectionUI:onLoadRootComplete()
} }
ModuleManager.TipsManager:showHelpTips(params) ModuleManager.TipsManager:showHelpTips(params)
end) end)
self:bind(DataManager.CollectionData, "dirtyHero", function() self.btnHero:addClickListener(function()
self:showHeroCollect()
end)
self.btnSkin:addClickListener(function()
self:showSkinCollect()
end)
self:bind(DataManager.CollectionData, "isDirty", function()
self:refreshCollectPoint() self:refreshCollectPoint()
self:showFlyAnim() self:showFlyAnim()
end) end)
@ -83,33 +104,32 @@ function CollectionUI:onLoadRootComplete()
end end
function CollectionUI:onRefresh() function CollectionUI:onRefresh()
if self.collectType == GConst.CollectionConst.TYPE.HERO then
self:showHeroCollect()
elseif self.collectType == GConst.CollectionConst.TYPE.SKIN then
self:showSkinCollect()
end
self:showCollectList() self:showCollectList()
self:refreshCollectPoint() self:refreshCollectPoint()
end end
function CollectionUI:showCollectList() function CollectionUI:showCollectList()
local datas = DataManager.CollectionData:getCollectList(self.collectType) self.collectList = DataManager.CollectionData:getCollectList(self.collectType)
self.scrollrectComp:addInitCallback(function()
return "app/ui/collection/cell/collection_hero_cell"
end)
self.scrollrectComp:addRefreshCallback(function(index, cell)
cell:refresh(datas[index])
end)
self.scrollrectComp:clearCells() self.scrollrectComp:clearCells()
self.scrollrectComp:refillCells(#datas) self.scrollrectComp:refillCells(#self.collectList)
self.flyIcon:setActive(false) self.flyIcon:setActive(false)
end end
-- 刷新收集点数状态 -- 刷新收集点数状态
function CollectionUI:refreshCollectPoint() function CollectionUI:refreshCollectPoint()
local showId = DataManager.CollectionData:getCanGetOrCollectingTargetId(self.collectType) local showId = DataManager.CollectionData:getCanGetOrCollectingTargetId()
-- Logger.logHighlight("展示档位:"..showId) -- Logger.logHighlight("展示档位:"..showId)
if showId then if showId then
local target = DataManager.CollectionData:getTargetPoint(self.collectType, showId) local target = DataManager.CollectionData:getTargetPoint(showId)
local owned = DataManager.CollectionData:getTargetOwnedPoint(self.collectType, showId) local owned = DataManager.CollectionData:getTargetOwnedPoint(showId)
self.txStage:setText(owned.."/"..target) self.txStage:setText(owned.."/"..target)
self.imgProg.value = owned / target self.imgProg.value = owned / target
if DataManager.CollectionData:isMeetTargetPoint(self.collectType, showId) then if DataManager.CollectionData:isMeetTargetPoint(showId) then
-- 可领取 -- 可领取
self.txGet:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM)) self.txGet:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM))
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_9)) self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_9))
@ -132,8 +152,8 @@ function CollectionUI:refreshCollectPoint()
self.btnGet:setTouchEnable(false) self.btnGet:setTouchEnable(false)
end end
local total = DataManager.CollectionData:getTotalCollectPoint(self.collectType) local total = DataManager.CollectionData:getTotalCollectPoint()
local cur = DataManager.CollectionData:getCurCollectPoint(self.collectType) local cur = DataManager.CollectionData:getCurCollectPoint()
self.txTotalValue:setText(cur.."/"..total) self.txTotalValue:setText(cur.."/"..total)
GFunc.centerImgAndTx(self.imgGet, self.txGet, 5) GFunc.centerImgAndTx(self.imgGet, self.txGet, 5)
@ -162,4 +182,24 @@ function CollectionUI:showFlyAnim()
end) end)
end end
-- 展示英雄收集
function CollectionUI:showHeroCollect()
self.collectType = GConst.CollectionConst.TYPE.HERO
self.selectHero:setActive(true)
self.selectSkin:setActive(false)
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_1))
self:showCollectList()
end
-- 展示皮肤收集
function CollectionUI:showSkinCollect()
self.collectType = GConst.CollectionConst.TYPE.SKIN
self.selectHero:setActive(false)
self.selectSkin:setActive(true)
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN_COLLECT))
self:showCollectList()
end
return CollectionUI return CollectionUI

View File

@ -12,8 +12,13 @@ function RewardCell:init()
self.sImg = uiMap["reward_cell.item_bg.s"] self.sImg = uiMap["reward_cell.item_bg.s"]
self.matchImg = uiMap["reward_cell.item_bg.match_img"] self.matchImg = uiMap["reward_cell.item_bg.match_img"]
self.frameAni = uiMap["reward_cell.frame_ani"] self.frameAni = uiMap["reward_cell.frame_ani"]
-- 首通
self.firstPass = uiMap["reward_cell.first"] self.firstPass = uiMap["reward_cell.first"]
self.firstPassTx = uiMap["reward_cell.first.tx_first"] self.firstPassTx = uiMap["reward_cell.first.tx_first"]
-- 皮肤
self.skin = uiMap["reward_cell.skin"]
self.skinQlt = uiMap["reward_cell.skin.img_qlt"]
self:hideFrameAnimation() self:hideFrameAnimation()
self.baseObject:addClickListener(function() self.baseObject:addClickListener(function()
if self.clickCallback then if self.clickCallback then
@ -99,6 +104,7 @@ function RewardCell:_refreshItem(info, count)
self.sImg:setVisible(false) self.sImg:setVisible(false)
self.matchImg:setVisible(false) self.matchImg:setVisible(false)
end end
self:showSkin(info.type == GConst.ItemConst.ITEM_TYPE.SKIN)
end end
function RewardCell:setNumTx(str) function RewardCell:setNumTx(str)
@ -161,6 +167,7 @@ function RewardCell:showRightUpIcon(show, atlas, iconName)
self.rightUpIcon:setSprite(atlas, iconName) self.rightUpIcon:setSprite(atlas, iconName)
end end
-- 展示首通标记
function RewardCell:showFirstPass(show) function RewardCell:showFirstPass(show)
self.firstPass:setVisible(show == true) self.firstPass:setVisible(show == true)
if show then if show then
@ -168,4 +175,15 @@ function RewardCell:showFirstPass(show)
end end
end end
-- 展示皮肤标记
function RewardCell:showSkin(show)
self.skin:setVisible(show == true)
if show then
local qlt = ConfigManager:getConfig("item")[self.rewardId]
self.skin:setSprite(GConst.ATLAS_PATH.ICON_HERO, "frame_dec_" .. qlt)
self.skinQlt:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_" .. qlt)
self.sImg:setVisible(qlt >= 4)
end
end
return RewardCell return RewardCell

View File

@ -123,8 +123,8 @@ function ArmorInfoComp:refreshSelectArmor()
local txNum = map["tx_num"] local txNum = map["tx_num"]
obj:setVisible(true) obj:setVisible(true)
if not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) and (curAtk > 0 or diffBaseAtk > 0) then if not table.containValue(showAttrType, GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()]) and (curAtk > 0 or diffBaseAtk > 0) then
table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) table.insert(showAttrType, GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()])
imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5") imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5")
txTitle:setText("<color=#FCB501>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3).."</color>") txTitle:setText("<color=#FCB501>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3).."</color>")
local numStr = curAtk // DEFAULT_FACTOR local numStr = curAtk // DEFAULT_FACTOR
@ -132,8 +132,8 @@ function ArmorInfoComp:refreshSelectArmor()
numStr = numStr .. "<color=#A2FF29>+" .. diffBaseAtk .. "</color>" numStr = numStr .. "<color=#A2FF29>+" .. diffBaseAtk .. "</color>"
end end
txNum:setText(numStr) txNum:setText(numStr)
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) and (curNormalHurt > 0 or diffBaseNormalHurt > 0) then elseif not table.containValue(showAttrType, GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()]) and (curNormalHurt > 0 or diffBaseNormalHurt > 0) then
table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) table.insert(showAttrType, GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()])
imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20") imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20")
txTitle:setText("<color=#4CCFFA>"..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT).."</color>") txTitle:setText("<color=#4CCFFA>"..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT).."</color>")
local numStr = curNormalHurt // DEFAULT_FACTOR local numStr = curNormalHurt // DEFAULT_FACTOR
@ -141,8 +141,8 @@ function ArmorInfoComp:refreshSelectArmor()
numStr = numStr .. "<color=#A2FF29>+" .. diffBaseNormalHurt .. "</color>" numStr = numStr .. "<color=#A2FF29>+" .. diffBaseNormalHurt .. "</color>"
end end
txNum:setText(numStr) txNum:setText(numStr)
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) and (curSkillHurt > 0 or diffBaseSkillHurt > 0) then elseif not table.containValue(showAttrType, GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()]) and (curSkillHurt > 0 or diffBaseSkillHurt > 0) then
table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) table.insert(showAttrType, GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()])
imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21") imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21")
txTitle:setText("<color=#EC80FF>"..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT).."</color>") txTitle:setText("<color=#EC80FF>"..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT).."</color>")
local numStr = curSkillHurt // DEFAULT_FACTOR local numStr = curSkillHurt // DEFAULT_FACTOR
@ -150,8 +150,8 @@ function ArmorInfoComp:refreshSelectArmor()
numStr = numStr .. "<color=#A2FF29>+" .. diffBaseSkillHurt .. "</color>" numStr = numStr .. "<color=#A2FF29>+" .. diffBaseSkillHurt .. "</color>"
end end
txNum:setText(numStr) txNum:setText(numStr)
elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) and (curHp > 0 or diffBaseHp > 0) then elseif not table.containValue(showAttrType, GConst.MATCH_HP_NAME[self.heroEntity:getMatchType()]) and (curHp > 0 or diffBaseHp > 0) then
table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) table.insert(showAttrType, GConst.MATCH_HP_NAME[self.heroEntity:getMatchType()])
imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4") imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4")
txTitle:setText("<color=#FB6895>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2).."</color>") txTitle:setText("<color=#FB6895>"..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2).."</color>")
local numStr = curHp // DEFAULT_FACTOR local numStr = curHp // DEFAULT_FACTOR

View File

@ -12,12 +12,6 @@ end
function AttrCell:refresh(heroEntity, nodeType, attrType) function AttrCell:refresh(heroEntity, nodeType, attrType)
self.heroEntity = heroEntity self.heroEntity = heroEntity
self.weaponEntity = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.WEAPON)
self.hatEntity = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT)
self.clothesEntity = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES)
self.beltEntity = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT)
self.handguardEntity = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD)
self.nodeType = nodeType self.nodeType = nodeType
self.attrName = attrType[self.heroEntity:getMatchType()] self.attrName = attrType[self.heroEntity:getMatchType()]
@ -61,13 +55,14 @@ function AttrCell:showHp()
value = self.heroEntity:getCfgHp(self.heroEntity:getBeginLv()) value = self.heroEntity:getCfgHp(self.heroEntity:getBeginLv())
end end
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
value = self.weaponEntity:getHp() value = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.WEAPON):getHp()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
value = value + self.hatEntity:getHp() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getHp()
value = value + self.clothesEntity:getHp() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getHp()
value = value + self.beltEntity:getHp() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getHp()
value = value + self.handguardEntity:getHp() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getHp()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getHp(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // DEFAULT_FACTOR) self.txValue:setText(value // DEFAULT_FACTOR)
@ -92,13 +87,14 @@ function AttrCell:showAtk()
value = self.heroEntity:getCfgAtk(self.heroEntity:getBeginLv()) value = self.heroEntity:getCfgAtk(self.heroEntity:getBeginLv())
end end
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
value = self.weaponEntity:getAttack() value = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.WEAPON):getAttack()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
value = value + self.hatEntity:getAttack() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getAttack()
value = value + self.clothesEntity:getAttack() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getAttack()
value = value + self.beltEntity:getAttack() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getAttack()
value = value + self.handguardEntity:getAttack() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getAttack()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getAttack(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // DEFAULT_FACTOR) self.txValue:setText(value // DEFAULT_FACTOR)
@ -115,11 +111,12 @@ function AttrCell:showNormalHurt()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
value = value + self.hatEntity:getNormalHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getNormalHurt()
value = value + self.clothesEntity:getNormalHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getNormalHurt()
value = value + self.beltEntity:getNormalHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getNormalHurt()
value = value + self.handguardEntity:getNormalHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getNormalHurt()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getNormalHurt(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // DEFAULT_FACTOR) self.txValue:setText(value // DEFAULT_FACTOR)
@ -136,11 +133,12 @@ function AttrCell:showSkillHurt()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
value = value + self.hatEntity:getSkillHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getSkillHurt()
value = value + self.clothesEntity:getSkillHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getSkillHurt()
value = value + self.beltEntity:getSkillHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getSkillHurt()
value = value + self.handguardEntity:getSkillHurt() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getSkillHurt()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getSkillHurt(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // DEFAULT_FACTOR) self.txValue:setText(value // DEFAULT_FACTOR)
@ -156,9 +154,10 @@ function AttrCell:showCrit()
value = self.heroEntity:getTotalAttrValue(self.attrName) value = self.heroEntity:getTotalAttrValue(self.attrName)
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
value = self.weaponEntity:getCritPercent() value = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.WEAPON):getCritPercent()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getCritPercent(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // PERCENT_FACTOR .. "%") self.txValue:setText(value // PERCENT_FACTOR .. "%")
@ -174,9 +173,10 @@ function AttrCell:showCritAtk()
value = self.heroEntity:getTotalAttrValue(self.attrName) value = self.heroEntity:getTotalAttrValue(self.attrName)
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
value = self.weaponEntity:getCritHurtPercent() value = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.WEAPON):getCritHurtPercent()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getCritHurtPercent(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // PERCENT_FACTOR .. "%") self.txValue:setText(value // PERCENT_FACTOR .. "%")
@ -194,11 +194,12 @@ function AttrCell:showNormalHurtp()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
-- 套装属性,防具只用计算一次 -- 套装属性,防具只用计算一次
value = value + self.hatEntity:getNormalHurtPercent() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getNormalHurtPercent()
-- value = value + self.clothesEntity:getNormalHurtPercent() -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getNormalHurtPercent()
-- value = value + self.beltEntity:getNormalHurtPercent() -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getNormalHurtPercent()
-- value = value + self.handguardEntity:getNormalHurtPercent() -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getNormalHurtPercent()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getNormalHurtPercent(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // PERCENT_FACTOR .. "%") self.txValue:setText(value // PERCENT_FACTOR .. "%")
@ -216,11 +217,12 @@ function AttrCell:showSkillHurtp()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
-- 套装属性,防具只用计算一次 -- 套装属性,防具只用计算一次
value = value + self.hatEntity:getSkillHurtPercent() value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getSkillHurtPercent()
-- value = value + self.clothesEntity:getSkillHurtPercent() -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getSkillHurtPercent()
-- value = value + self.beltEntity:getSkillHurtPercent() -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getSkillHurtPercent()
-- value = value + self.handguardEntity:getSkillHurtPercent() -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getSkillHurtPercent()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getSkillHurtPercent(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // PERCENT_FACTOR .. "%") self.txValue:setText(value // PERCENT_FACTOR .. "%")
@ -236,9 +238,10 @@ function AttrCell:showCured()
value = self.heroEntity:getTotalAttrValue(self.attrName) value = self.heroEntity:getTotalAttrValue(self.attrName)
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_WEAPON then
value = self.weaponEntity:getHealPercent() value = self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.WEAPON):getHealPercent()
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then
elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then
value = value + DataManager.SkinData:getHealPercent(self.heroEntity:getCfgId())
end end
self.txValue:setText(value // PERCENT_FACTOR .. "%") self.txValue:setText(value // PERCENT_FACTOR .. "%")

View File

@ -22,11 +22,20 @@ function AttrNodeCell:refresh(heroEntity, node)
self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_17)) self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_17))
end end
self.attrCount = 0
for index, attr in ipairs(node) do for index, attr in ipairs(node) do
CellManager:loadCellAsync(ATTR_CELL_PATH, ATTR_CELL, self.itemsRoot, function(cell) if node ~= GConst.HeroConst.ATTR_SHOW_SKIN or DataManager.SkinData:hasAttr(heroEntity:getCfgId(), attr[heroEntity:getMatchType()]) then
cell:refresh(heroEntity, node, attr) self.attrCount = self.attrCount + 1
end) CellManager:loadCellAsync(ATTR_CELL_PATH, ATTR_CELL, self.itemsRoot, function(cell)
cell:refresh(heroEntity, node, attr)
end)
end
end end
end end
--获取节点显示属性个数
function AttrNodeCell:getShowAttrCount()
return self.attrCount
end
return AttrNodeCell return AttrNodeCell

View File

@ -0,0 +1,39 @@
local SkinCell = class("SkinCell", BaseCell)
function SkinCell:init()
local uiMap = self:getUIMap()
self.spineRoot = uiMap["skin_cell.spine_root.spine_hero"]
self.bgQlt = uiMap["skin_cell.bg_qlt"]
self.imgQlt = uiMap["skin_cell.bg_qlt.img_qlt"]
self.select = uiMap["skin_cell.select"]
self.imgS = uiMap["skin_cell.img_s"]
self:addClickListener(function()
EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.SKIN_SELECT, self.skinId)
end)
end
function SkinCell:refresh(id, isSelect)
self.skinId = id
local cfg = DataManager.SkinData:getSkinCfg(self.skinId)
SpineManager:loadHeroAsync(DataManager.SkinData:getModelId(self.skinId), self.spineRoot, function(spineObject)
if self.spineHero then
self.spineHero:destroy()
self.spineHero = nil
end
spineObject:setDefaultMix(0)
self.spineHero = spineObject
end)
local qlt = cfg.qlt
self.imgS:setActive(qlt >= 4)
self.select:setActive(isSelect)
self.baseObject:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_frame_".. qlt .. "_1")
self.bgQlt:setSprite(GConst.ATLAS_PATH.HERO, "hero_frame_bg_".. qlt)
self.imgQlt:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_" .. qlt)
end
return SkinCell

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b390f1e69773bbc4b8a6c84deb1fe030 guid: f9f8a5d8d516dd643baf7a10d7b45da0
ScriptedImporter: ScriptedImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}

View File

@ -43,15 +43,21 @@ end
function HeroAttrUI:onRefresh() function HeroAttrUI:onRefresh()
local totalHeight = 0 local totalHeight = 0
for index, node in ipairs(GConst.HeroConst.SHOW_NODE) do for index, node in ipairs(GConst.HeroConst.SHOW_NODE) do
CellManager:loadCellAsync(ATTR_NODE_CELL_PATH, ATTR_NODE_CELL, self.rootNodes, function(cell) -- 有皮肤属性时才显示皮肤
local nodeHeight = math.ceil(#node / 2) * ATTR_CELL_HEIGHT + (math.ceil(#node / 2) - 1) * ATTR_CELL_SPACING_Y + ATTR_CELLS_PADDING if node ~= GConst.HeroConst.ATTR_SHOW_SKIN or #DataManager.SkinData:getOwnAllAttr(self.heroEntity:getCfgId()) > 0 then
cell.baseObject:setLocalPositionY(-totalHeight) CellManager:loadCellAsync(ATTR_NODE_CELL_PATH, ATTR_NODE_CELL, self.rootNodes, function(cell)
cell.baseObject:setSizeDeltaY(nodeHeight) cell:refresh(self.heroEntity, node)
cell:refresh(self.heroEntity, node)
totalHeight = totalHeight + nodeHeight local attrCount = cell:getShowAttrCount()
self.rootNodes:setSizeDeltaY(totalHeight) local nodeHeight = math.ceil(attrCount / 2) * ATTR_CELL_HEIGHT + (math.ceil(attrCount / 2) - 1) * ATTR_CELL_SPACING_Y + ATTR_CELLS_PADDING
end) cell.baseObject:setLocalPositionY(-totalHeight)
cell.baseObject:setSizeDeltaY(nodeHeight)
totalHeight = totalHeight + nodeHeight
self.rootNodes:setSizeDeltaY(totalHeight)
end)
end
end end
self.rootNodes:setAnchoredPositionY(0)
end end
return HeroAttrUI return HeroAttrUI

View File

@ -67,7 +67,7 @@ function HeroComp:init()
end end
end end
self:bind(DataManager.CollectionData, "dirtyHero", function() self:bind(DataManager.CollectionData, "isDirty", function()
self:refreshCollectEntrance() self:refreshCollectEntrance()
end) end)
self:bind(DataManager.HeroData, "isDirty", function() self:bind(DataManager.HeroData, "isDirty", function()
@ -287,8 +287,8 @@ end
-- 刷新图鉴入口 -- 刷新图鉴入口
function HeroComp:refreshCollectEntrance() function HeroComp:refreshCollectEntrance()
if self.battleType == GConst.BattleConst.FORMATION_TYPE.STAGE then if self.battleType == GConst.BattleConst.FORMATION_TYPE.STAGE then
self.btnCollection:setVisible(DataManager.CollectionData:isOpen(GConst.CollectionConst.TYPE.HERO)) self.btnCollection:setVisible(DataManager.CollectionData:isOpen())
if DataManager.CollectionData:hasRedPoint(GConst.CollectionConst.TYPE.HERO) then if DataManager.CollectionData:hasRedPoint() then
self.btnCollection:addRedPoint(25, 30, 0.6) self.btnCollection:addRedPoint(25, 30, 0.6)
else else
self.btnCollection:removeRedPoint() self.btnCollection:removeRedPoint()

View File

@ -2,9 +2,18 @@ local HeroDetailUI = class("HeroDetailUI", BaseUI)
local COMP_HERO = "app/ui/hero/hero_info_comp" local COMP_HERO = "app/ui/hero/hero_info_comp"
local COMP_WEAPON = "app/ui/hero/weapon_info_comp" local COMP_WEAPON = "app/ui/hero/weapon_info_comp"
local COMP_ARMOR = "app/ui/hero/armor_info_comp" local COMP_ARMOR = "app/ui/hero/armor_info_comp"
local COMP_SKIN = "app/ui/hero/skin_info_comp"
local SIZE_DELTA_Y_HERO = 942 local SIZE_DELTA_Y_HERO = 942
local SIZE_DELTA_Y_LOOK = 802 local SIZE_DELTA_Y_LOOK = 802
-- 界面类型
local PANEL_TYPE = {
HERO = 1,
WEAPON = 2,
ARMOR = 3,
SKIN = 4,
}
function HeroDetailUI:isFullScreen() function HeroDetailUI:isFullScreen()
return false return false
end end
@ -18,7 +27,7 @@ function HeroDetailUI:onPressBackspace()
end end
function HeroDetailUI:ctor(parmas) function HeroDetailUI:ctor(parmas)
self.panelType = parmas.panelType or GConst.EquipConst.PANEL_TYPE.HERO self.panelType = parmas.panelType or PANEL_TYPE.HERO
self.onlyLook = parmas.onlyLook self.onlyLook = parmas.onlyLook
if parmas.heroEntity then if parmas.heroEntity then
self.heroEntity = parmas.heroEntity self.heroEntity = parmas.heroEntity
@ -35,6 +44,7 @@ function HeroDetailUI:onLoadRootComplete()
self.heroInfo = uiMap["hero_detail_ui.hero_info"] self.heroInfo = uiMap["hero_detail_ui.hero_info"]
self.weaponInfo = uiMap["hero_detail_ui.weapon_info"] self.weaponInfo = uiMap["hero_detail_ui.weapon_info"]
self.armorInfo = uiMap["hero_detail_ui.armor_info"] self.armorInfo = uiMap["hero_detail_ui.armor_info"]
self.skinInfo = uiMap["hero_detail_ui.skin_info"]
self.txTitle = uiMap["hero_detail_ui.common.img_title.tx_title"] self.txTitle = uiMap["hero_detail_ui.common.img_title.tx_title"]
self.btnClose = uiMap["hero_detail_ui.common.btn_close"] self.btnClose = uiMap["hero_detail_ui.common.btn_close"]
self.btnHero = uiMap["hero_detail_ui.common.btns.btn_hero"] self.btnHero = uiMap["hero_detail_ui.common.btns.btn_hero"]
@ -51,6 +61,11 @@ function HeroDetailUI:onLoadRootComplete()
self.txArmor1 = uiMap["hero_detail_ui.common.btns.btn_armor.tx_btn"] self.txArmor1 = uiMap["hero_detail_ui.common.btns.btn_armor.tx_btn"]
self.selectArmor = uiMap["hero_detail_ui.common.btns.btn_armor.select"] self.selectArmor = uiMap["hero_detail_ui.common.btns.btn_armor.select"]
self.txArmor2 = uiMap["hero_detail_ui.common.btns.btn_armor.select.tx_select"] self.txArmor2 = uiMap["hero_detail_ui.common.btns.btn_armor.select.tx_select"]
self.btnSkin = uiMap["hero_detail_ui.common.btns.btn_skin"]
self.lockSkin = uiMap["hero_detail_ui.common.btns.btn_skin.content.img_lock"]
self.txSkin1 = uiMap["hero_detail_ui.common.btns.btn_skin.content.tx_btn"]
self.selectSkin = uiMap["hero_detail_ui.common.btns.btn_skin.select"]
self.txSkin2 = uiMap["hero_detail_ui.common.btns.btn_skin.select.tx_select"]
self.btnLeft = uiMap["hero_detail_ui.common.btn_left"] self.btnLeft = uiMap["hero_detail_ui.common.btn_left"]
self.btnRight = uiMap["hero_detail_ui.common.btn_right"] self.btnRight = uiMap["hero_detail_ui.common.btn_right"]
@ -60,6 +75,8 @@ function HeroDetailUI:onLoadRootComplete()
self.txWeapon2:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_1)) self.txWeapon2:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_1))
self.txArmor1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_2)) self.txArmor1:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_2))
self.txArmor2:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_2)) self.txArmor2:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_2))
self.txSkin1:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN))
self.txSkin2:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN))
if not DataManager.EquipData:isWeaponOpen() then if not DataManager.EquipData:isWeaponOpen() then
self.lockWeapon:setVisible(true) self.lockWeapon:setVisible(true)
GFunc.centerImgAndTx(self.lockWeapon, self.txWeapon1, 5) GFunc.centerImgAndTx(self.lockWeapon, self.txWeapon1, 5)
@ -72,27 +89,40 @@ function HeroDetailUI:onLoadRootComplete()
else else
self.lockArmor:setVisible(false) self.lockArmor:setVisible(false)
end end
if not DataManager.SkinData:isOpen() then
self.lockSkin:setVisible(true)
GFunc.centerImgAndTx(self.lockSkin, self.txSkin1, 5)
else
self.lockSkin:setVisible(false)
end
self.heroList = DataManager.HeroData:getAllHeroesSort() self.heroList = DataManager.HeroData:getAllHeroesSort()
self:updateSide() self:updateSide()
self:refreshShow() self:refreshShow()
self.btnHero:addClickListener(function() self.btnHero:addClickListener(function()
self.panelType = GConst.EquipConst.PANEL_TYPE.HERO self.panelType = PANEL_TYPE.HERO
self:refreshShow() self:refreshShow()
end) end)
self.btnWeapon:addClickListener(function() self.btnWeapon:addClickListener(function()
if not DataManager.EquipData:isWeaponOpen(true) then if not DataManager.EquipData:isWeaponOpen(true) then
return return
end end
self.panelType = GConst.EquipConst.PANEL_TYPE.WEAPON self.panelType = PANEL_TYPE.WEAPON
self:refreshShow() self:refreshShow()
end) end)
self.btnArmor:addClickListener(function() self.btnArmor:addClickListener(function()
if not DataManager.EquipData:isArmorOpen(true) then if not DataManager.EquipData:isArmorOpen(true) then
return return
end end
self.panelType = GConst.EquipConst.PANEL_TYPE.ARMOR self.panelType = PANEL_TYPE.ARMOR
self:refreshShow()
end)
self.btnSkin:addClickListener(function()
if not DataManager.SkinData:isOpen(true) then
return
end
self.panelType = PANEL_TYPE.SKIN
self:refreshShow() self:refreshShow()
end) end)
self.btnClose:addClickListener(function() self.btnClose:addClickListener(function()
@ -139,6 +169,9 @@ function HeroDetailUI:onLoadRootComplete()
self:addEventListener(EventManager.CUSTOM_EVENT.GO_DUNGEON_UI, function() self:addEventListener(EventManager.CUSTOM_EVENT.GO_DUNGEON_UI, function()
self:closeUI() self:closeUI()
end) end)
self:addEventListener(EventManager.CUSTOM_EVENT.SKIN_SELECT, function(skinId)
self.compSkin:refreshSelectSkin(skinId)
end)
end end
function HeroDetailUI:updateSide() function HeroDetailUI:updateSide()
@ -152,18 +185,20 @@ end
function HeroDetailUI:refreshShow() function HeroDetailUI:refreshShow()
self.txTitle:setText(self.heroEntity:getName()) self.txTitle:setText(self.heroEntity:getName())
if self.panelType == PANEL_TYPE.HERO then
if self.panelType == GConst.EquipConst.PANEL_TYPE.HERO then
self:showHeroInfo() self:showHeroInfo()
elseif self.panelType == GConst.EquipConst.PANEL_TYPE.WEAPON then elseif self.panelType == PANEL_TYPE.WEAPON then
self:showWeaponInfo() self:showWeaponInfo()
elseif self.panelType == GConst.EquipConst.PANEL_TYPE.ARMOR then elseif self.panelType == PANEL_TYPE.ARMOR then
self:showArmorInfo() self:showArmorInfo()
elseif self.panelType == PANEL_TYPE.SKIN then
self:showSkinInfo()
end end
if self.onlyLook then -- 仅查看的不显示升级和激活按钮 if self.onlyLook then -- 仅查看的不显示升级和激活按钮
self.btnHero:setActive(false) self.btnHero:setActive(false)
self.btnWeapon:setActive(false) self.btnWeapon:setActive(false)
self.btnArmor:setActive(false) self.btnArmor:setActive(false)
self.btnSkin:setActive(false)
self.btnLeft:setActive(false) self.btnLeft:setActive(false)
self.btnRight:setActive(false) self.btnRight:setActive(false)
self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_LOOK) self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_LOOK)
@ -171,6 +206,7 @@ function HeroDetailUI:refreshShow()
self.btnHero:setActive(true) self.btnHero:setActive(true)
self.btnWeapon:setActive(true) self.btnWeapon:setActive(true)
self.btnArmor:setActive(true) self.btnArmor:setActive(true)
self.btnSkin:setActive(true)
self.btnLeft:setActive(self:isExistLeftHero()) self.btnLeft:setActive(self:isExistLeftHero())
self.btnRight:setActive(self:isExistRightHero()) self.btnRight:setActive(self:isExistRightHero())
self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_HERO) self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_HERO)
@ -181,17 +217,17 @@ end
-- 刷新标签红点 -- 刷新标签红点
function HeroDetailUI:refreshRedPoint() function HeroDetailUI:refreshRedPoint()
if self.heroEntity:canLvUp() then if self.heroEntity:canLvUp() then
self.btnHero:addRedPoint(-70, 0, 0.6) self.btnHero:addRedPoint(-55, 0, 0.6)
else else
self.btnHero:removeRedPoint() self.btnHero:removeRedPoint()
end end
if DataManager.EquipData:canUpgradeWeapon(self.heroEntity:getCfgId()) then if DataManager.EquipData:canUpgradeWeapon(self.heroEntity:getCfgId()) then
self.btnWeapon:addRedPoint(-70, 0, 0.6) self.btnWeapon:addRedPoint(-55, 0, 0.6)
else else
self.btnWeapon:removeRedPoint() self.btnWeapon:removeRedPoint()
end end
if DataManager.EquipData:canUpgradeArmor(self.heroEntity:getCfgId()) then if DataManager.EquipData:canUpgradeArmor(self.heroEntity:getCfgId()) then
self.btnArmor:addRedPoint(-70, 0, 0.6) self.btnArmor:addRedPoint(-55, 0, 0.6)
else else
self.btnArmor:removeRedPoint() self.btnArmor:removeRedPoint()
end end
@ -204,6 +240,8 @@ function HeroDetailUI:showHeroInfo()
self.selectWeapon:setActive(false) self.selectWeapon:setActive(false)
self.armorInfo:setActive(false) self.armorInfo:setActive(false)
self.selectArmor:setActive(false) self.selectArmor:setActive(false)
self.skinInfo:setActive(false)
self.selectSkin:setActive(false)
if not self.compHero then if not self.compHero then
self.heroInfo:initPrefabHelper() self.heroInfo:initPrefabHelper()
@ -222,6 +260,8 @@ function HeroDetailUI:showWeaponInfo()
self.selectWeapon:setActive(true) self.selectWeapon:setActive(true)
self.armorInfo:setActive(false) self.armorInfo:setActive(false)
self.selectArmor:setActive(false) self.selectArmor:setActive(false)
self.skinInfo:setActive(false)
self.selectSkin:setActive(false)
if not self.compWeapon then if not self.compWeapon then
self.weaponInfo:initPrefabHelper() self.weaponInfo:initPrefabHelper()
@ -241,6 +281,8 @@ function HeroDetailUI:showArmorInfo()
self.selectWeapon:setActive(false) self.selectWeapon:setActive(false)
self.armorInfo:setActive(true) self.armorInfo:setActive(true)
self.selectArmor:setActive(true) self.selectArmor:setActive(true)
self.skinInfo:setActive(false)
self.selectSkin:setActive(false)
if not self.compArmor then if not self.compArmor then
self.armorInfo:initPrefabHelper() self.armorInfo:initPrefabHelper()
@ -253,6 +295,27 @@ function HeroDetailUI:showArmorInfo()
self.compArmor:refresh() self.compArmor:refresh()
end end
function HeroDetailUI:showSkinInfo()
self.heroInfo:setActive(false)
self.selectHero:setActive(false)
self.weaponInfo:setActive(false)
self.selectWeapon:setActive(false)
self.armorInfo:setActive(false)
self.selectArmor:setActive(false)
self.skinInfo:setActive(true)
self.selectSkin:setActive(true)
if not self.compSkin then
self.skinInfo:initPrefabHelper()
self.skinInfo:genAllChildren()
self.compSkin = self.skinInfo:addLuaComponent(COMP_SKIN)
self.compSkin:setUI(self)
end
self.compSkin:setHeroData(self.heroEntity)
self.compSkin:refresh()
end
-- 是否存在左侧英雄 -- 是否存在左侧英雄
function HeroDetailUI:isExistLeftHero() function HeroDetailUI:isExistLeftHero()
return self.idxLast and self.idxLast > 0 return self.idxLast and self.idxLast > 0

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