diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 48a4ed08..fd8812d3 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -15,6 +15,7 @@ function DataManager:init() self:initManager("HeroData", "app/userdata/hero/hero_data") self:initManager("BagData", "app/userdata/bag/bag_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("BattlePVPData", "app/userdata/battle/battle_pvp_data") self:initManager("FormationData", "app/userdata/formation/formation_data") @@ -100,6 +101,7 @@ function DataManager:clear() self.HeroData:clear() self.BagData:clear() self.EquipData:clear() + self.SkinData:clear() self.FormationData:clear() self.ActivityData:clear() self.MailData:clear() @@ -138,7 +140,8 @@ function DataManager:initWithServerData(data) self.DungeonData:initDungeonGold(data.chapter_gold_challenge) self.DungeonData:initDungeonShards(data.chapter_shards_challenge) self.EquipData:init(data.heroes_equips) - -- HeroData要在EquipData之后初始化，依赖装备的属性数据 + self.SkinData:init(data.bag.skins) + -- HeroData要在EquipData和SkinData之后初始化，依赖它们的属性数据 self.HeroData:init(data.bag.heroes) self.BagData:init(data.bag) self.FormationData:init(data.fight_info) diff --git a/lua/app/common/event_manager.lua b/lua/app/common/event_manager.lua index f76be33f..9c257c9a 100644 --- a/lua/app/common/event_manager.lua +++ b/lua/app/common/event_manager.lua @@ -54,6 +54,8 @@ EventManager.CUSTOM_EVENT = { EQUIP_UPSECTION_SUCCESS = "EQUIP_UPSECTION_SUCCESS", HERO_UPGRADE_SUCCESS = "HERO_UPGRADE_SUCCESS", GO_DUNGEON_UI = "GO_DUNGEON_UI", + -- 皮肤 + SKIN_SELECT = "SKIN_SELECT", -- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN", -- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER" DUNGEON_ARMOR_TO_TARGET_ID = "DUNGEON_ARMOR_TO_TARGET_ID", diff --git a/lua/app/common/module_manager.lua b/lua/app/common/module_manager.lua index 127e6400..778dfb7a 100644 --- a/lua/app/common/module_manager.lua +++ b/lua/app/common/module_manager.lua @@ -67,6 +67,8 @@ local MODULE_PATHS = { DungeonArmorManager = "app/module/dungeon_armor/dungeon_armor_manager", -- 装备 EquipManager = "app/module/equip/equip_manager", + -- 皮肤 + SkinManager = "app/module/skin/skin_manager", } -- 这里的key对应func_open里的id @@ -96,6 +98,7 @@ ModuleManager.MODULE_KEY = { DUNGEON_WEAPON = "dungeon_weapon_open", -- 装备副本 EQUIP_WEAPON = "equip_weapon_open", -- 武器 EQUIP_ARMOR = "equip_armor_open", -- 防具 + SKIN = "skin_open", -- 皮肤 } local _moduleMgrs = {} @@ -119,6 +122,7 @@ function ModuleManager:init() ModuleManager.TaskManager:init() ModuleManager.DailyChallengeManager:init() ModuleManager.PlayerManager:init() + ModuleManager.SkinManager:init() end -- 功能是否开启 diff --git a/lua/app/config/chapter.lua b/lua/app/config/chapter.lua index 4add4b0e..5876ad50 100644 --- a/lua/app/config/chapter.lua +++ b/lua/app/config/chapter.lua @@ -7386,7 +7386,7 @@ local chapter = { ["before_chapter"]=35, ["next_chapter"]=37, ["icon"]="chapter_31", - ["scene"]="bg_26", + ["scene"]="bg_31", ["block_icon"]="battle_hinder_26", ["chess_board"]="chessboard_1", ["board"]={ @@ -7605,7 +7605,7 @@ local chapter = { ["before_chapter"]=36, ["next_chapter"]=38, ["icon"]="chapter_32", - ["scene"]="bg_27", + ["scene"]="bg_32", ["block_icon"]="battle_hinder_27", ["chess_board"]="chessboard_1", ["board"]={ @@ -7824,7 +7824,7 @@ local chapter = { ["before_chapter"]=37, ["next_chapter"]=39, ["icon"]="chapter_33", - ["scene"]="bg_28", + ["scene"]="bg_33", ["block_icon"]="battle_hinder_28", ["chess_board"]="chessboard_1", ["board"]={ @@ -8043,7 +8043,7 @@ local chapter = { ["before_chapter"]=38, ["next_chapter"]=40, ["icon"]="chapter_34", - ["scene"]="bg_29", + ["scene"]="bg_34", ["block_icon"]="battle_hinder_30", ["chess_board"]="chessboard_3", ["board"]={ @@ -8261,7 +8261,7 @@ local chapter = { [40]={ ["before_chapter"]=39, ["icon"]="chapter_35", - ["scene"]="bg_30", + ["scene"]="bg_35", ["block_icon"]="battle_hinder_29", ["chess_board"]="chessboard_3", ["board"]={ diff --git a/lua/app/config/equip.lua b/lua/app/config/equip.lua index 7ce3409f..84ce5944 100644 --- a/lua/app/config/equip.lua +++ b/lua/app/config/equip.lua @@ -11124,6 +11124,2231 @@ local equip = { 48 } }, + [1400301]={ + ["hero"]=14003, + ["part"]=1, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_atkp_red", + ["num"]=1000 + }, + { + ["type"]="attr_crit_red", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_red", + ["num"]=1000 + }, + { + ["type"]="attr_crit_time_red", + ["num"]=3000 + }, + { + ["type"]="attr_atkp_red", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 64, + 64, + 65, + 65, + 66, + 66 + } + }, + [1400302]={ + ["hero"]=14003, + ["part"]=2, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["skill_hurt_add"]={ + 60000, + 120000, + 180000, + 240000, + 300000, + 360000, + 420000, + 480000, + 540000, + 600000, + 660000, + 720000, + 780000, + 840000, + 900000, + 960000, + 1020000, + 1080000, + 1140000, + 1200000, + 1260000, + 1320000, + 1380000, + 1440000, + 1500000, + 1560000, + 1620000, + 1680000, + 1740000, + 1800000, + 1860000, + 1920000, + 1980000, + 2040000, + 2100000, + 2160000, + 2220000, + 2280000, + 2340000, + 2400000, + 2460000, + 2520000, + 2580000, + 2640000, + 2700000, + 2760000, + 2820000, + 2880000, + 2940000, + 3000000, + 3060000, + 3120000, + 3180000, + 3240000, + 3300000, + 3360000, + 3420000, + 3480000, + 3540000, + 3600000, + 3660000, + 3720000, + 3780000, + 3840000, + 3900000, + 3960000, + 4020000, + 4080000, + 4140000, + 4200000, + 4260000, + 4320000, + 4380000, + 4440000, + 4500000, + 4560000, + 4620000, + 4680000, + 4740000, + 4800000, + 4890000, + 4980000, + 5070000, + 5160000, + 5250000, + 5340000, + 5430000, + 5520000, + 5610000, + 5700000, + 5790000, + 5880000, + 5970000, + 6060000, + 6150000, + 6240000, + 6330000, + 6420000, + 6510000, + 6600000, + 6690000, + 6780000, + 6870000, + 6960000, + 7050000, + 7140000, + 7230000, + 7320000, + 7410000, + 7500000, + 7590000, + 7680000, + 7770000, + 7860000, + 7950000, + 8040000, + 8130000, + 8220000, + 8310000, + 8400000, + 8490000, + 8580000, + 8670000, + 8760000, + 8850000, + 8940000, + 9030000, + 9120000, + 9210000, + 9300000, + 9390000, + 9480000, + 9570000, + 9660000, + 9750000, + 9840000, + 9930000, + 10020000, + 10110000, + 10200000, + 10290000, + 10380000, + 10470000, + 10560000, + 10650000, + 10740000, + 10830000, + 10920000, + 11010000, + 11100000, + 11190000, + 11280000, + 11370000, + 11460000, + 11550000, + 11640000, + 11730000, + 11820000, + 11910000, + 12000000, + 12090000, + 12180000, + 12270000, + 12360000, + 12450000, + 12540000, + 12630000, + 12720000, + 12810000, + 12900000, + 12990000, + 13080000, + 13170000, + 13260000, + 13350000, + 13440000, + 13530000, + 13620000, + 13710000, + 13800000, + 13890000, + 13980000, + 14070000, + 14160000, + 14250000, + 14340000, + 14430000, + 14520000, + 14610000, + 14700000, + 14790000, + 14880000, + 14970000, + 15060000, + 15150000, + 15240000, + 15330000, + 15420000, + 15510000, + 15600000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_red", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_red", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_red", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 31, + 32, + 33, + 34, + 35, + 36 + } + }, + [1400303]={ + ["hero"]=14003, + ["part"]=3, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_red", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_red", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_red", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 19, + 20, + 21, + 22, + 23, + 24 + } + }, + [1400304]={ + ["hero"]=14003, + ["part"]=4, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["normal_hurt_add"]={ + 20000, + 40000, + 60000, + 80000, + 100000, + 120000, + 140000, + 160000, + 180000, + 200000, + 220000, + 240000, + 260000, + 280000, + 300000, + 320000, + 340000, + 360000, + 380000, + 400000, + 420000, + 440000, + 460000, + 480000, + 500000, + 520000, + 540000, + 560000, + 580000, + 600000, + 620000, + 640000, + 660000, + 680000, + 700000, + 720000, + 740000, + 760000, + 780000, + 800000, + 820000, + 840000, + 860000, + 880000, + 900000, + 920000, + 940000, + 960000, + 980000, + 1000000, + 1020000, + 1040000, + 1060000, + 1080000, + 1100000, + 1120000, + 1140000, + 1160000, + 1180000, + 1200000, + 1220000, + 1240000, + 1260000, + 1280000, + 1300000, + 1320000, + 1340000, + 1360000, + 1380000, + 1400000, + 1420000, + 1440000, + 1460000, + 1480000, + 1500000, + 1520000, + 1540000, + 1560000, + 1580000, + 1600000, + 1630000, + 1660000, + 1690000, + 1720000, + 1750000, + 1780000, + 1810000, + 1840000, + 1870000, + 1900000, + 1930000, + 1960000, + 1990000, + 2020000, + 2050000, + 2080000, + 2110000, + 2140000, + 2170000, + 2200000, + 2230000, + 2260000, + 2290000, + 2320000, + 2350000, + 2380000, + 2410000, + 2440000, + 2470000, + 2500000, + 2530000, + 2560000, + 2590000, + 2620000, + 2650000, + 2680000, + 2710000, + 2740000, + 2770000, + 2800000, + 2830000, + 2860000, + 2890000, + 2920000, + 2950000, + 2980000, + 3010000, + 3040000, + 3070000, + 3100000, + 3130000, + 3160000, + 3190000, + 3220000, + 3250000, + 3280000, + 3310000, + 3340000, + 3370000, + 3400000, + 3430000, + 3460000, + 3490000, + 3520000, + 3550000, + 3580000, + 3610000, + 3640000, + 3670000, + 3700000, + 3730000, + 3760000, + 3790000, + 3820000, + 3850000, + 3880000, + 3910000, + 3940000, + 3970000, + 4000000, + 4030000, + 4060000, + 4090000, + 4120000, + 4150000, + 4180000, + 4210000, + 4240000, + 4270000, + 4300000, + 4330000, + 4360000, + 4390000, + 4420000, + 4450000, + 4480000, + 4510000, + 4540000, + 4570000, + 4600000, + 4630000, + 4660000, + 4690000, + 4720000, + 4750000, + 4780000, + 4810000, + 4840000, + 4870000, + 4900000, + 4930000, + 4960000, + 4990000, + 5020000, + 5050000, + 5080000, + 5110000, + 5140000, + 5170000, + 5200000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_red", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_red", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_red", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 7, + 8, + 9, + 10, + 11, + 12 + } + }, + [1400305]={ + ["hero"]=14003, + ["part"]=5, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_red", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_red", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_red", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_red", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 43, + 44, + 45, + 46, + 47, + 48 + } + }, [2200101]={ ["hero"]=22001, ["part"]=1, @@ -22249,6 +24474,2231 @@ local equip = { 48 } }, + [2400301]={ + ["hero"]=24003, + ["part"]=1, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_atkp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_crit_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_crit_time_yellow", + ["num"]=3000 + }, + { + ["type"]="attr_atkp_yellow", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 61, + 61, + 62, + 62, + 63, + 63 + } + }, + [2400302]={ + ["hero"]=24003, + ["part"]=2, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["skill_hurt_add"]={ + 60000, + 120000, + 180000, + 240000, + 300000, + 360000, + 420000, + 480000, + 540000, + 600000, + 660000, + 720000, + 780000, + 840000, + 900000, + 960000, + 1020000, + 1080000, + 1140000, + 1200000, + 1260000, + 1320000, + 1380000, + 1440000, + 1500000, + 1560000, + 1620000, + 1680000, + 1740000, + 1800000, + 1860000, + 1920000, + 1980000, + 2040000, + 2100000, + 2160000, + 2220000, + 2280000, + 2340000, + 2400000, + 2460000, + 2520000, + 2580000, + 2640000, + 2700000, + 2760000, + 2820000, + 2880000, + 2940000, + 3000000, + 3060000, + 3120000, + 3180000, + 3240000, + 3300000, + 3360000, + 3420000, + 3480000, + 3540000, + 3600000, + 3660000, + 3720000, + 3780000, + 3840000, + 3900000, + 3960000, + 4020000, + 4080000, + 4140000, + 4200000, + 4260000, + 4320000, + 4380000, + 4440000, + 4500000, + 4560000, + 4620000, + 4680000, + 4740000, + 4800000, + 4890000, + 4980000, + 5070000, + 5160000, + 5250000, + 5340000, + 5430000, + 5520000, + 5610000, + 5700000, + 5790000, + 5880000, + 5970000, + 6060000, + 6150000, + 6240000, + 6330000, + 6420000, + 6510000, + 6600000, + 6690000, + 6780000, + 6870000, + 6960000, + 7050000, + 7140000, + 7230000, + 7320000, + 7410000, + 7500000, + 7590000, + 7680000, + 7770000, + 7860000, + 7950000, + 8040000, + 8130000, + 8220000, + 8310000, + 8400000, + 8490000, + 8580000, + 8670000, + 8760000, + 8850000, + 8940000, + 9030000, + 9120000, + 9210000, + 9300000, + 9390000, + 9480000, + 9570000, + 9660000, + 9750000, + 9840000, + 9930000, + 10020000, + 10110000, + 10200000, + 10290000, + 10380000, + 10470000, + 10560000, + 10650000, + 10740000, + 10830000, + 10920000, + 11010000, + 11100000, + 11190000, + 11280000, + 11370000, + 11460000, + 11550000, + 11640000, + 11730000, + 11820000, + 11910000, + 12000000, + 12090000, + 12180000, + 12270000, + 12360000, + 12450000, + 12540000, + 12630000, + 12720000, + 12810000, + 12900000, + 12990000, + 13080000, + 13170000, + 13260000, + 13350000, + 13440000, + 13530000, + 13620000, + 13710000, + 13800000, + 13890000, + 13980000, + 14070000, + 14160000, + 14250000, + 14340000, + 14430000, + 14520000, + 14610000, + 14700000, + 14790000, + 14880000, + 14970000, + 15060000, + 15150000, + 15240000, + 15330000, + 15420000, + 15510000, + 15600000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_yellow", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 31, + 32, + 33, + 34, + 35, + 36 + } + }, + [2400303]={ + ["hero"]=24003, + ["part"]=3, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_yellow", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 19, + 20, + 21, + 22, + 23, + 24 + } + }, + [2400304]={ + ["hero"]=24003, + ["part"]=4, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["normal_hurt_add"]={ + 20000, + 40000, + 60000, + 80000, + 100000, + 120000, + 140000, + 160000, + 180000, + 200000, + 220000, + 240000, + 260000, + 280000, + 300000, + 320000, + 340000, + 360000, + 380000, + 400000, + 420000, + 440000, + 460000, + 480000, + 500000, + 520000, + 540000, + 560000, + 580000, + 600000, + 620000, + 640000, + 660000, + 680000, + 700000, + 720000, + 740000, + 760000, + 780000, + 800000, + 820000, + 840000, + 860000, + 880000, + 900000, + 920000, + 940000, + 960000, + 980000, + 1000000, + 1020000, + 1040000, + 1060000, + 1080000, + 1100000, + 1120000, + 1140000, + 1160000, + 1180000, + 1200000, + 1220000, + 1240000, + 1260000, + 1280000, + 1300000, + 1320000, + 1340000, + 1360000, + 1380000, + 1400000, + 1420000, + 1440000, + 1460000, + 1480000, + 1500000, + 1520000, + 1540000, + 1560000, + 1580000, + 1600000, + 1630000, + 1660000, + 1690000, + 1720000, + 1750000, + 1780000, + 1810000, + 1840000, + 1870000, + 1900000, + 1930000, + 1960000, + 1990000, + 2020000, + 2050000, + 2080000, + 2110000, + 2140000, + 2170000, + 2200000, + 2230000, + 2260000, + 2290000, + 2320000, + 2350000, + 2380000, + 2410000, + 2440000, + 2470000, + 2500000, + 2530000, + 2560000, + 2590000, + 2620000, + 2650000, + 2680000, + 2710000, + 2740000, + 2770000, + 2800000, + 2830000, + 2860000, + 2890000, + 2920000, + 2950000, + 2980000, + 3010000, + 3040000, + 3070000, + 3100000, + 3130000, + 3160000, + 3190000, + 3220000, + 3250000, + 3280000, + 3310000, + 3340000, + 3370000, + 3400000, + 3430000, + 3460000, + 3490000, + 3520000, + 3550000, + 3580000, + 3610000, + 3640000, + 3670000, + 3700000, + 3730000, + 3760000, + 3790000, + 3820000, + 3850000, + 3880000, + 3910000, + 3940000, + 3970000, + 4000000, + 4030000, + 4060000, + 4090000, + 4120000, + 4150000, + 4180000, + 4210000, + 4240000, + 4270000, + 4300000, + 4330000, + 4360000, + 4390000, + 4420000, + 4450000, + 4480000, + 4510000, + 4540000, + 4570000, + 4600000, + 4630000, + 4660000, + 4690000, + 4720000, + 4750000, + 4780000, + 4810000, + 4840000, + 4870000, + 4900000, + 4930000, + 4960000, + 4990000, + 5020000, + 5050000, + 5080000, + 5110000, + 5140000, + 5170000, + 5200000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_yellow", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 7, + 8, + 9, + 10, + 11, + 12 + } + }, + [2400305]={ + ["hero"]=24003, + ["part"]=5, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_yellow", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_yellow", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 43, + 44, + 45, + 46, + 47, + 48 + } + }, [3200101]={ ["hero"]=32001, ["part"]=1, @@ -33374,6 +37824,2231 @@ local equip = { 42 } }, + [3400301]={ + ["hero"]=34003, + ["part"]=1, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_atkp_green", + ["num"]=1000 + }, + { + ["type"]="attr_crit_green", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_green", + ["num"]=1000 + }, + { + ["type"]="attr_crit_time_green", + ["num"]=3000 + }, + { + ["type"]="attr_atkp_green", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 67, + 67, + 68, + 68, + 69, + 69 + } + }, + [3400302]={ + ["hero"]=34003, + ["part"]=2, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["skill_hurt_add"]={ + 60000, + 120000, + 180000, + 240000, + 300000, + 360000, + 420000, + 480000, + 540000, + 600000, + 660000, + 720000, + 780000, + 840000, + 900000, + 960000, + 1020000, + 1080000, + 1140000, + 1200000, + 1260000, + 1320000, + 1380000, + 1440000, + 1500000, + 1560000, + 1620000, + 1680000, + 1740000, + 1800000, + 1860000, + 1920000, + 1980000, + 2040000, + 2100000, + 2160000, + 2220000, + 2280000, + 2340000, + 2400000, + 2460000, + 2520000, + 2580000, + 2640000, + 2700000, + 2760000, + 2820000, + 2880000, + 2940000, + 3000000, + 3060000, + 3120000, + 3180000, + 3240000, + 3300000, + 3360000, + 3420000, + 3480000, + 3540000, + 3600000, + 3660000, + 3720000, + 3780000, + 3840000, + 3900000, + 3960000, + 4020000, + 4080000, + 4140000, + 4200000, + 4260000, + 4320000, + 4380000, + 4440000, + 4500000, + 4560000, + 4620000, + 4680000, + 4740000, + 4800000, + 4890000, + 4980000, + 5070000, + 5160000, + 5250000, + 5340000, + 5430000, + 5520000, + 5610000, + 5700000, + 5790000, + 5880000, + 5970000, + 6060000, + 6150000, + 6240000, + 6330000, + 6420000, + 6510000, + 6600000, + 6690000, + 6780000, + 6870000, + 6960000, + 7050000, + 7140000, + 7230000, + 7320000, + 7410000, + 7500000, + 7590000, + 7680000, + 7770000, + 7860000, + 7950000, + 8040000, + 8130000, + 8220000, + 8310000, + 8400000, + 8490000, + 8580000, + 8670000, + 8760000, + 8850000, + 8940000, + 9030000, + 9120000, + 9210000, + 9300000, + 9390000, + 9480000, + 9570000, + 9660000, + 9750000, + 9840000, + 9930000, + 10020000, + 10110000, + 10200000, + 10290000, + 10380000, + 10470000, + 10560000, + 10650000, + 10740000, + 10830000, + 10920000, + 11010000, + 11100000, + 11190000, + 11280000, + 11370000, + 11460000, + 11550000, + 11640000, + 11730000, + 11820000, + 11910000, + 12000000, + 12090000, + 12180000, + 12270000, + 12360000, + 12450000, + 12540000, + 12630000, + 12720000, + 12810000, + 12900000, + 12990000, + 13080000, + 13170000, + 13260000, + 13350000, + 13440000, + 13530000, + 13620000, + 13710000, + 13800000, + 13890000, + 13980000, + 14070000, + 14160000, + 14250000, + 14340000, + 14430000, + 14520000, + 14610000, + 14700000, + 14790000, + 14880000, + 14970000, + 15060000, + 15150000, + 15240000, + 15330000, + 15420000, + 15510000, + 15600000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_green", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_green", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_green", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_green", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_green", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 25, + 26, + 27, + 28, + 29, + 30 + } + }, + [3400303]={ + ["hero"]=34003, + ["part"]=3, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_green", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_green", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_green", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_green", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_green", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 13, + 14, + 15, + 16, + 17, + 18 + } + }, + [3400304]={ + ["hero"]=34003, + ["part"]=4, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["normal_hurt_add"]={ + 20000, + 40000, + 60000, + 80000, + 100000, + 120000, + 140000, + 160000, + 180000, + 200000, + 220000, + 240000, + 260000, + 280000, + 300000, + 320000, + 340000, + 360000, + 380000, + 400000, + 420000, + 440000, + 460000, + 480000, + 500000, + 520000, + 540000, + 560000, + 580000, + 600000, + 620000, + 640000, + 660000, + 680000, + 700000, + 720000, + 740000, + 760000, + 780000, + 800000, + 820000, + 840000, + 860000, + 880000, + 900000, + 920000, + 940000, + 960000, + 980000, + 1000000, + 1020000, + 1040000, + 1060000, + 1080000, + 1100000, + 1120000, + 1140000, + 1160000, + 1180000, + 1200000, + 1220000, + 1240000, + 1260000, + 1280000, + 1300000, + 1320000, + 1340000, + 1360000, + 1380000, + 1400000, + 1420000, + 1440000, + 1460000, + 1480000, + 1500000, + 1520000, + 1540000, + 1560000, + 1580000, + 1600000, + 1630000, + 1660000, + 1690000, + 1720000, + 1750000, + 1780000, + 1810000, + 1840000, + 1870000, + 1900000, + 1930000, + 1960000, + 1990000, + 2020000, + 2050000, + 2080000, + 2110000, + 2140000, + 2170000, + 2200000, + 2230000, + 2260000, + 2290000, + 2320000, + 2350000, + 2380000, + 2410000, + 2440000, + 2470000, + 2500000, + 2530000, + 2560000, + 2590000, + 2620000, + 2650000, + 2680000, + 2710000, + 2740000, + 2770000, + 2800000, + 2830000, + 2860000, + 2890000, + 2920000, + 2950000, + 2980000, + 3010000, + 3040000, + 3070000, + 3100000, + 3130000, + 3160000, + 3190000, + 3220000, + 3250000, + 3280000, + 3310000, + 3340000, + 3370000, + 3400000, + 3430000, + 3460000, + 3490000, + 3520000, + 3550000, + 3580000, + 3610000, + 3640000, + 3670000, + 3700000, + 3730000, + 3760000, + 3790000, + 3820000, + 3850000, + 3880000, + 3910000, + 3940000, + 3970000, + 4000000, + 4030000, + 4060000, + 4090000, + 4120000, + 4150000, + 4180000, + 4210000, + 4240000, + 4270000, + 4300000, + 4330000, + 4360000, + 4390000, + 4420000, + 4450000, + 4480000, + 4510000, + 4540000, + 4570000, + 4600000, + 4630000, + 4660000, + 4690000, + 4720000, + 4750000, + 4780000, + 4810000, + 4840000, + 4870000, + 4900000, + 4930000, + 4960000, + 4990000, + 5020000, + 5050000, + 5080000, + 5110000, + 5140000, + 5170000, + 5200000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_green", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_green", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_green", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_green", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_green", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 1, + 2, + 3, + 4, + 5, + 6 + } + }, + [3400305]={ + ["hero"]=34003, + ["part"]=5, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_green", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_green", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_green", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_green", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_green", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 37, + 38, + 39, + 40, + 41, + 42 + } + }, [4200101]={ ["hero"]=42001, ["part"]=1, @@ -44499,6 +51174,2231 @@ local equip = { 42 } }, + [4400301]={ + ["hero"]=44003, + ["part"]=1, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_atkp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_crit_blue", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_crit_time_blue", + ["num"]=3000 + }, + { + ["type"]="attr_atkp_blue", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 70, + 70, + 71, + 71, + 72, + 72 + } + }, + [4400302]={ + ["hero"]=44003, + ["part"]=2, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["skill_hurt_add"]={ + 60000, + 120000, + 180000, + 240000, + 300000, + 360000, + 420000, + 480000, + 540000, + 600000, + 660000, + 720000, + 780000, + 840000, + 900000, + 960000, + 1020000, + 1080000, + 1140000, + 1200000, + 1260000, + 1320000, + 1380000, + 1440000, + 1500000, + 1560000, + 1620000, + 1680000, + 1740000, + 1800000, + 1860000, + 1920000, + 1980000, + 2040000, + 2100000, + 2160000, + 2220000, + 2280000, + 2340000, + 2400000, + 2460000, + 2520000, + 2580000, + 2640000, + 2700000, + 2760000, + 2820000, + 2880000, + 2940000, + 3000000, + 3060000, + 3120000, + 3180000, + 3240000, + 3300000, + 3360000, + 3420000, + 3480000, + 3540000, + 3600000, + 3660000, + 3720000, + 3780000, + 3840000, + 3900000, + 3960000, + 4020000, + 4080000, + 4140000, + 4200000, + 4260000, + 4320000, + 4380000, + 4440000, + 4500000, + 4560000, + 4620000, + 4680000, + 4740000, + 4800000, + 4890000, + 4980000, + 5070000, + 5160000, + 5250000, + 5340000, + 5430000, + 5520000, + 5610000, + 5700000, + 5790000, + 5880000, + 5970000, + 6060000, + 6150000, + 6240000, + 6330000, + 6420000, + 6510000, + 6600000, + 6690000, + 6780000, + 6870000, + 6960000, + 7050000, + 7140000, + 7230000, + 7320000, + 7410000, + 7500000, + 7590000, + 7680000, + 7770000, + 7860000, + 7950000, + 8040000, + 8130000, + 8220000, + 8310000, + 8400000, + 8490000, + 8580000, + 8670000, + 8760000, + 8850000, + 8940000, + 9030000, + 9120000, + 9210000, + 9300000, + 9390000, + 9480000, + 9570000, + 9660000, + 9750000, + 9840000, + 9930000, + 10020000, + 10110000, + 10200000, + 10290000, + 10380000, + 10470000, + 10560000, + 10650000, + 10740000, + 10830000, + 10920000, + 11010000, + 11100000, + 11190000, + 11280000, + 11370000, + 11460000, + 11550000, + 11640000, + 11730000, + 11820000, + 11910000, + 12000000, + 12090000, + 12180000, + 12270000, + 12360000, + 12450000, + 12540000, + 12630000, + 12720000, + 12810000, + 12900000, + 12990000, + 13080000, + 13170000, + 13260000, + 13350000, + 13440000, + 13530000, + 13620000, + 13710000, + 13800000, + 13890000, + 13980000, + 14070000, + 14160000, + 14250000, + 14340000, + 14430000, + 14520000, + 14610000, + 14700000, + 14790000, + 14880000, + 14970000, + 15060000, + 15150000, + 15240000, + 15330000, + 15420000, + 15510000, + 15600000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_blue", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_blue", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 25, + 26, + 27, + 28, + 29, + 30 + } + }, + [4400303]={ + ["hero"]=44003, + ["part"]=3, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_blue", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_blue", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 13, + 14, + 15, + 16, + 17, + 18 + } + }, + [4400304]={ + ["hero"]=44003, + ["part"]=4, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["normal_hurt_add"]={ + 20000, + 40000, + 60000, + 80000, + 100000, + 120000, + 140000, + 160000, + 180000, + 200000, + 220000, + 240000, + 260000, + 280000, + 300000, + 320000, + 340000, + 360000, + 380000, + 400000, + 420000, + 440000, + 460000, + 480000, + 500000, + 520000, + 540000, + 560000, + 580000, + 600000, + 620000, + 640000, + 660000, + 680000, + 700000, + 720000, + 740000, + 760000, + 780000, + 800000, + 820000, + 840000, + 860000, + 880000, + 900000, + 920000, + 940000, + 960000, + 980000, + 1000000, + 1020000, + 1040000, + 1060000, + 1080000, + 1100000, + 1120000, + 1140000, + 1160000, + 1180000, + 1200000, + 1220000, + 1240000, + 1260000, + 1280000, + 1300000, + 1320000, + 1340000, + 1360000, + 1380000, + 1400000, + 1420000, + 1440000, + 1460000, + 1480000, + 1500000, + 1520000, + 1540000, + 1560000, + 1580000, + 1600000, + 1630000, + 1660000, + 1690000, + 1720000, + 1750000, + 1780000, + 1810000, + 1840000, + 1870000, + 1900000, + 1930000, + 1960000, + 1990000, + 2020000, + 2050000, + 2080000, + 2110000, + 2140000, + 2170000, + 2200000, + 2230000, + 2260000, + 2290000, + 2320000, + 2350000, + 2380000, + 2410000, + 2440000, + 2470000, + 2500000, + 2530000, + 2560000, + 2590000, + 2620000, + 2650000, + 2680000, + 2710000, + 2740000, + 2770000, + 2800000, + 2830000, + 2860000, + 2890000, + 2920000, + 2950000, + 2980000, + 3010000, + 3040000, + 3070000, + 3100000, + 3130000, + 3160000, + 3190000, + 3220000, + 3250000, + 3280000, + 3310000, + 3340000, + 3370000, + 3400000, + 3430000, + 3460000, + 3490000, + 3520000, + 3550000, + 3580000, + 3610000, + 3640000, + 3670000, + 3700000, + 3730000, + 3760000, + 3790000, + 3820000, + 3850000, + 3880000, + 3910000, + 3940000, + 3970000, + 4000000, + 4030000, + 4060000, + 4090000, + 4120000, + 4150000, + 4180000, + 4210000, + 4240000, + 4270000, + 4300000, + 4330000, + 4360000, + 4390000, + 4420000, + 4450000, + 4480000, + 4510000, + 4540000, + 4570000, + 4600000, + 4630000, + 4660000, + 4690000, + 4720000, + 4750000, + 4780000, + 4810000, + 4840000, + 4870000, + 4900000, + 4930000, + 4960000, + 4990000, + 5020000, + 5050000, + 5080000, + 5110000, + 5140000, + 5170000, + 5200000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_blue", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_blue", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 1, + 2, + 3, + 4, + 5, + 6 + } + }, + [4400305]={ + ["hero"]=44003, + ["part"]=5, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_blue", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_blue", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_blue", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 37, + 38, + 39, + 40, + 41, + 42 + } + }, [5200101]={ ["hero"]=52001, ["part"]=1, @@ -55623,9 +64523,2234 @@ local equip = { 41, 42 } + }, + [5400301]={ + ["hero"]=54003, + ["part"]=1, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_atkp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_crit_purple", + ["num"]=1000 + }, + { + ["type"]="attr_hpp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_crit_time_purple", + ["num"]=3000 + }, + { + ["type"]="attr_atkp_purple", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 73, + 73, + 74, + 74, + 75, + 75 + } + }, + [5400302]={ + ["hero"]=54003, + ["part"]=2, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["skill_hurt_add"]={ + 60000, + 120000, + 180000, + 240000, + 300000, + 360000, + 420000, + 480000, + 540000, + 600000, + 660000, + 720000, + 780000, + 840000, + 900000, + 960000, + 1020000, + 1080000, + 1140000, + 1200000, + 1260000, + 1320000, + 1380000, + 1440000, + 1500000, + 1560000, + 1620000, + 1680000, + 1740000, + 1800000, + 1860000, + 1920000, + 1980000, + 2040000, + 2100000, + 2160000, + 2220000, + 2280000, + 2340000, + 2400000, + 2460000, + 2520000, + 2580000, + 2640000, + 2700000, + 2760000, + 2820000, + 2880000, + 2940000, + 3000000, + 3060000, + 3120000, + 3180000, + 3240000, + 3300000, + 3360000, + 3420000, + 3480000, + 3540000, + 3600000, + 3660000, + 3720000, + 3780000, + 3840000, + 3900000, + 3960000, + 4020000, + 4080000, + 4140000, + 4200000, + 4260000, + 4320000, + 4380000, + 4440000, + 4500000, + 4560000, + 4620000, + 4680000, + 4740000, + 4800000, + 4890000, + 4980000, + 5070000, + 5160000, + 5250000, + 5340000, + 5430000, + 5520000, + 5610000, + 5700000, + 5790000, + 5880000, + 5970000, + 6060000, + 6150000, + 6240000, + 6330000, + 6420000, + 6510000, + 6600000, + 6690000, + 6780000, + 6870000, + 6960000, + 7050000, + 7140000, + 7230000, + 7320000, + 7410000, + 7500000, + 7590000, + 7680000, + 7770000, + 7860000, + 7950000, + 8040000, + 8130000, + 8220000, + 8310000, + 8400000, + 8490000, + 8580000, + 8670000, + 8760000, + 8850000, + 8940000, + 9030000, + 9120000, + 9210000, + 9300000, + 9390000, + 9480000, + 9570000, + 9660000, + 9750000, + 9840000, + 9930000, + 10020000, + 10110000, + 10200000, + 10290000, + 10380000, + 10470000, + 10560000, + 10650000, + 10740000, + 10830000, + 10920000, + 11010000, + 11100000, + 11190000, + 11280000, + 11370000, + 11460000, + 11550000, + 11640000, + 11730000, + 11820000, + 11910000, + 12000000, + 12090000, + 12180000, + 12270000, + 12360000, + 12450000, + 12540000, + 12630000, + 12720000, + 12810000, + 12900000, + 12990000, + 13080000, + 13170000, + 13260000, + 13350000, + 13440000, + 13530000, + 13620000, + 13710000, + 13800000, + 13890000, + 13980000, + 14070000, + 14160000, + 14250000, + 14340000, + 14430000, + 14520000, + 14610000, + 14700000, + 14790000, + 14880000, + 14970000, + 15060000, + 15150000, + 15240000, + 15330000, + 15420000, + 15510000, + 15600000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_purple", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_purple", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 25, + 26, + 27, + 28, + 29, + 30 + } + }, + [5400303]={ + ["hero"]=54003, + ["part"]=3, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_purple", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_purple", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 13, + 14, + 15, + 16, + 17, + 18 + } + }, + [5400304]={ + ["hero"]=54003, + ["part"]=4, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["normal_hurt_add"]={ + 20000, + 40000, + 60000, + 80000, + 100000, + 120000, + 140000, + 160000, + 180000, + 200000, + 220000, + 240000, + 260000, + 280000, + 300000, + 320000, + 340000, + 360000, + 380000, + 400000, + 420000, + 440000, + 460000, + 480000, + 500000, + 520000, + 540000, + 560000, + 580000, + 600000, + 620000, + 640000, + 660000, + 680000, + 700000, + 720000, + 740000, + 760000, + 780000, + 800000, + 820000, + 840000, + 860000, + 880000, + 900000, + 920000, + 940000, + 960000, + 980000, + 1000000, + 1020000, + 1040000, + 1060000, + 1080000, + 1100000, + 1120000, + 1140000, + 1160000, + 1180000, + 1200000, + 1220000, + 1240000, + 1260000, + 1280000, + 1300000, + 1320000, + 1340000, + 1360000, + 1380000, + 1400000, + 1420000, + 1440000, + 1460000, + 1480000, + 1500000, + 1520000, + 1540000, + 1560000, + 1580000, + 1600000, + 1630000, + 1660000, + 1690000, + 1720000, + 1750000, + 1780000, + 1810000, + 1840000, + 1870000, + 1900000, + 1930000, + 1960000, + 1990000, + 2020000, + 2050000, + 2080000, + 2110000, + 2140000, + 2170000, + 2200000, + 2230000, + 2260000, + 2290000, + 2320000, + 2350000, + 2380000, + 2410000, + 2440000, + 2470000, + 2500000, + 2530000, + 2560000, + 2590000, + 2620000, + 2650000, + 2680000, + 2710000, + 2740000, + 2770000, + 2800000, + 2830000, + 2860000, + 2890000, + 2920000, + 2950000, + 2980000, + 3010000, + 3040000, + 3070000, + 3100000, + 3130000, + 3160000, + 3190000, + 3220000, + 3250000, + 3280000, + 3310000, + 3340000, + 3370000, + 3400000, + 3430000, + 3460000, + 3490000, + 3520000, + 3550000, + 3580000, + 3610000, + 3640000, + 3670000, + 3700000, + 3730000, + 3760000, + 3790000, + 3820000, + 3850000, + 3880000, + 3910000, + 3940000, + 3970000, + 4000000, + 4030000, + 4060000, + 4090000, + 4120000, + 4150000, + 4180000, + 4210000, + 4240000, + 4270000, + 4300000, + 4330000, + 4360000, + 4390000, + 4420000, + 4450000, + 4480000, + 4510000, + 4540000, + 4570000, + 4600000, + 4630000, + 4660000, + 4690000, + 4720000, + 4750000, + 4780000, + 4810000, + 4840000, + 4870000, + 4900000, + 4930000, + 4960000, + 4990000, + 5020000, + 5050000, + 5080000, + 5110000, + 5140000, + 5170000, + 5200000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_purple", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_purple", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 1, + 2, + 3, + 4, + 5, + 6 + } + }, + [5400305]={ + ["hero"]=54003, + ["part"]=5, + ["armor_hp"]={ + 40000, + 80000, + 120000, + 160000, + 200000, + 240000, + 280000, + 320000, + 360000, + 400000, + 440000, + 480000, + 520000, + 560000, + 600000, + 640000, + 680000, + 720000, + 760000, + 800000, + 840000, + 880000, + 920000, + 960000, + 1000000, + 1040000, + 1080000, + 1120000, + 1160000, + 1200000, + 1240000, + 1280000, + 1320000, + 1360000, + 1400000, + 1440000, + 1480000, + 1520000, + 1560000, + 1600000, + 1640000, + 1680000, + 1720000, + 1760000, + 1800000, + 1840000, + 1880000, + 1920000, + 1960000, + 2000000, + 2040000, + 2080000, + 2120000, + 2160000, + 2200000, + 2240000, + 2280000, + 2320000, + 2360000, + 2400000, + 2440000, + 2480000, + 2520000, + 2560000, + 2600000, + 2640000, + 2680000, + 2720000, + 2760000, + 2800000, + 2840000, + 2880000, + 2920000, + 2960000, + 3000000, + 3040000, + 3080000, + 3120000, + 3160000, + 3200000, + 3250000, + 3300000, + 3350000, + 3400000, + 3450000, + 3500000, + 3550000, + 3600000, + 3650000, + 3700000, + 3750000, + 3800000, + 3850000, + 3900000, + 3950000, + 4000000, + 4050000, + 4100000, + 4150000, + 4200000, + 4250000, + 4300000, + 4350000, + 4400000, + 4450000, + 4500000, + 4550000, + 4600000, + 4650000, + 4700000, + 4750000, + 4800000, + 4850000, + 4900000, + 4950000, + 5000000, + 5050000, + 5100000, + 5150000, + 5200000, + 5270000, + 5340000, + 5410000, + 5480000, + 5550000, + 5620000, + 5690000, + 5760000, + 5830000, + 5900000, + 5970000, + 6040000, + 6110000, + 6180000, + 6250000, + 6320000, + 6390000, + 6460000, + 6530000, + 6600000, + 6670000, + 6740000, + 6810000, + 6880000, + 6950000, + 7020000, + 7090000, + 7160000, + 7230000, + 7300000, + 7370000, + 7440000, + 7510000, + 7580000, + 7650000, + 7720000, + 7790000, + 7860000, + 7930000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10480000, + 10560000, + 10640000, + 10720000, + 10800000, + 10880000, + 10960000, + 11040000, + 11120000, + 11200000 + }, + ["armor_atk"]={ + 50000, + 100000, + 150000, + 200000, + 250000, + 300000, + 350000, + 400000, + 450000, + 500000, + 550000, + 600000, + 650000, + 700000, + 750000, + 800000, + 850000, + 900000, + 950000, + 1000000, + 1050000, + 1100000, + 1150000, + 1200000, + 1250000, + 1300000, + 1350000, + 1400000, + 1450000, + 1500000, + 1550000, + 1600000, + 1650000, + 1700000, + 1750000, + 1800000, + 1850000, + 1900000, + 1950000, + 2000000, + 2060000, + 2120000, + 2180000, + 2240000, + 2300000, + 2360000, + 2420000, + 2480000, + 2540000, + 2600000, + 2660000, + 2720000, + 2780000, + 2840000, + 2900000, + 2960000, + 3020000, + 3080000, + 3140000, + 3200000, + 3260000, + 3320000, + 3380000, + 3440000, + 3500000, + 3560000, + 3620000, + 3680000, + 3740000, + 3800000, + 3860000, + 3920000, + 3980000, + 4040000, + 4100000, + 4160000, + 4220000, + 4280000, + 4340000, + 4400000, + 4470000, + 4540000, + 4610000, + 4680000, + 4750000, + 4820000, + 4890000, + 4960000, + 5030000, + 5100000, + 5170000, + 5240000, + 5310000, + 5380000, + 5450000, + 5520000, + 5590000, + 5660000, + 5730000, + 5800000, + 5870000, + 5940000, + 6010000, + 6080000, + 6150000, + 6220000, + 6290000, + 6360000, + 6430000, + 6500000, + 6570000, + 6640000, + 6710000, + 6780000, + 6850000, + 6920000, + 6990000, + 7060000, + 7130000, + 7200000, + 7280000, + 7360000, + 7440000, + 7520000, + 7600000, + 7680000, + 7760000, + 7840000, + 7920000, + 8000000, + 8080000, + 8160000, + 8240000, + 8320000, + 8400000, + 8480000, + 8560000, + 8640000, + 8720000, + 8800000, + 8880000, + 8960000, + 9040000, + 9120000, + 9200000, + 9280000, + 9360000, + 9440000, + 9520000, + 9600000, + 9680000, + 9760000, + 9840000, + 9920000, + 10000000, + 10080000, + 10160000, + 10240000, + 10320000, + 10400000, + 10500000, + 10600000, + 10700000, + 10800000, + 10900000, + 11000000, + 11100000, + 11200000, + 11300000, + 11400000, + 11500000, + 11600000, + 11700000, + 11800000, + 11900000, + 12000000, + 12100000, + 12200000, + 12300000, + 12400000, + 12500000, + 12600000, + 12700000, + 12800000, + 12900000, + 13000000, + 13100000, + 13200000, + 13300000, + 13400000, + 13500000, + 13600000, + 13700000, + 13800000, + 13900000, + 14000000, + 14100000, + 14200000, + 14300000, + 14400000 + }, + ["features_level"]={ + 40, + 80, + 120, + 160, + 200 + }, + ["features_attr"]={ + { + ["type"]="attr_hpp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_skill_hurtp_purple", + ["num"]=1000 + }, + { + ["type"]="attr_normal_hurtp_purple", + ["num"]=2000 + }, + { + ["type"]="attr_skill_hurtp_purple", + ["num"]=2000 + } + }, + ["weapon_icon"]={ + 37, + 38, + 39, + 40, + 41, + 42 + } } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua index c807d195..b46f4dce 100644 --- a/lua/app/config/hero.lua +++ b/lua/app/config/hero.lua @@ -365,7 +365,8 @@ local hero = { 31780000, 36060000 }, - ["model_id"]="p0018", + ["model_id"]="p0028", + ["icon"]="31", ["item_id"]=14003, ["collection_point"]=5, ["skin"]={ @@ -737,8 +738,10 @@ local hero = { 31780000, 36060000 }, - ["model_id"]="p0018", + ["model_id"]="p0031", + ["icon"]="27", ["item_id"]=24003, + ["unlock_arena"]=10, ["collection_point"]=5, ["skin"]={ 24003 @@ -1111,7 +1114,7 @@ local hero = { 36060000 }, ["model_id"]="p0027", - ["icon"]="24", + ["icon"]="28", ["item_id"]=34002, ["unlock_arena"]=6, ["is_show"]=1, @@ -1488,7 +1491,7 @@ local hero = { 36060000 }, ["model_id"]="p0030", - ["icon"]="24", + ["icon"]="29", ["item_id"]=44003, ["collection_point"]=5, ["skin"]={ @@ -1863,9 +1866,10 @@ local hero = { 31780000, 36060000 }, - ["model_id"]="p0030", - ["icon"]="24", + ["model_id"]="p0029", + ["icon"]="30", ["item_id"]=54003, + ["unlock_arena"]=3, ["collection_point"]=5, ["skin"]={ 54003 diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index bfad4aea..12fe2d2e 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1374,7 +1374,7 @@ local skill = { ["effect"]={ { ["type"]="hurt_red", - ["num"]=60000, + ["num"]=80000, ["ratio"]=10000, ["round"]=0 } @@ -1413,82 +1413,19 @@ local skill = { }, [1400222]={ ["position"]=1, - ["buff_condition"]={ - { - { - ["type"]="state", - ["attr"]="frozen", - ["op"]=">", - ["v"]=0, - ["side"]=2 - } - } - }, - ["condition_rel"]={ - { - 1, - 1 - } - }, - ["combo_position"]=1, ["effect_type"]=2, - ["trigger"]=7, + ["trigger"]=6, ["effect"]={ { - ["type"]="dmg_addition_red_add", - ["num"]=5000, + ["type"]="normal_attack_add", + ["num"]=2, ["ratio"]=10000, - ["round"]=1 + ["round"]=3 } }, ["obj"]=1 }, [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, ["effect_type"]=2, ["trigger"]=5, @@ -1502,37 +1439,6 @@ local skill = { }, ["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]={ ["position"]=1, ["effect_type"]=1, @@ -1643,13 +1549,31 @@ local skill = { ["position"]=1, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="21", + ["battle_icon"]="30", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { ["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, ["round"]=0 }, @@ -1661,6 +1585,12 @@ local skill = { } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3, + 5 + }, ["skill_position"]={ 1, 100 @@ -3253,13 +3183,19 @@ local skill = { ["boardrange"]={ }, - ["battle_icon"]="22", + ["battle_icon"]="26", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ { ["type"]="hurt_yellow", - ["num"]=40000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt_yellow", + ["num"]=30000, ["ratio"]=10000, ["round"]=0 }, @@ -3271,6 +3207,10 @@ local skill = { } }, ["obj"]=2, + ["effect_block"]={ + 1, + 3 + }, ["skill_position"]={ 1, 100 @@ -4857,7 +4797,7 @@ local skill = { ["range"]=3 } }, - ["battle_icon"]="23", + ["battle_icon"]="27", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -4934,7 +4874,7 @@ local skill = { { ["type"]="bleed", ["num"]=3500, - ["ratio"]=10000, + ["ratio"]=1000, ["round"]=2 } }, @@ -6338,7 +6278,7 @@ local skill = { ["position"]=4, ["method"]=1, ["skill_type"]=0, - ["battle_icon"]="24", + ["battle_icon"]="28", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -7883,7 +7823,7 @@ local skill = { ["skill_type_parameter"]={ }, - ["battle_icon"]="25", + ["battle_icon"]="29", ["effect_type"]=1, ["trigger"]=1, ["effect"]={ @@ -7897,7 +7837,7 @@ local skill = { ["type"]="corrupt", ["num"]=5000, ["ratio"]=10000, - ["round"]=2 + ["round"]=1 } }, ["obj"]=2, @@ -25694,6 +25634,6 @@ local skill = { } } local config = { -data=skill,count=930 +data=skill,count=928 } return config \ No newline at end of file diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 1976337c..4c08f31b 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -1233,7 +1233,7 @@ local skill_rogue = { [1400202]={ ["limit_times"]=1, ["weight"]=3000, - ["qlt"]=3, + ["qlt"]=4, ["type"]=12, ["skill_position"]=1, ["effect"]={ @@ -1248,14 +1248,22 @@ local skill_rogue = { ["icon"]="197" }, [1400203]={ + ["method"]=2, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=3, - ["type"]=1, - ["parameter"]={ - 1400223 - }, + ["type"]=2, ["skill_position"]=1, + ["boardrange"]={ + { + ["type"]=3, + ["range"]=2 + }, + { + ["type"]=4, + ["range"]=2 + } + }, ["icon"]="198" }, [1400204]={ @@ -1267,7 +1275,7 @@ local skill_rogue = { ["effect"]={ { ["type"]="add_skill", - ["num"]=1400224, + ["num"]=1400223, ["ratio"]=10000, ["round"]=999 } @@ -1279,12 +1287,15 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=12, + ["type"]=14, + ["parameter"]={ + 6 + }, ["skill_position"]=1, ["effect"]={ { - ["type"]="add_skill", - ["num"]=1400225, + ["type"]="skill_fire_times", + ["num"]=1400220, ["ratio"]=10000, ["round"]=1 } @@ -1310,13 +1321,12 @@ local skill_rogue = { ["icon"]="201" }, [1400207]={ + ["unlock"]=1400205, + ["cover_unlock"]=1400205, ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=14, - ["parameter"]={ - 6 - }, + ["type"]=12, ["skill_position"]=1, ["effect"]={ { @@ -1324,12 +1334,6 @@ local skill_rogue = { ["num"]=1400220, ["ratio"]=10000, ["round"]=1 - }, - { - ["type"]="skill_fire_times", - ["num"]=1400223, - ["ratio"]=10000, - ["round"]=1 } }, ["obj"]=3, @@ -1383,7 +1387,7 @@ local skill_rogue = { ["qlt"]=3, ["type"]=7, ["parameter"]={ - 2, + 5, 1000 }, ["skill_position"]=1, @@ -2153,7 +2157,7 @@ local skill_rogue = { ["qlt"]=4, ["type"]=8, ["parameter"]={ - 2, + 3, 1 }, ["skill_position"]=2, @@ -2908,6 +2912,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=5, ["icon"]="210" }, [3400302]={ @@ -2935,6 +2940,7 @@ local skill_rogue = { ["round"]=999 } }, + ["obj"]=5, ["icon"]="212" }, [3400304]={ @@ -2951,6 +2957,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=1, ["icon"]="213" }, [3400305]={ @@ -2967,6 +2974,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=5, ["icon"]="214" }, [3400306]={ @@ -2999,6 +3007,7 @@ local skill_rogue = { ["round"]=1 } }, + ["obj"]=5, ["icon"]="216" }, [4200100]={ diff --git a/lua/app/config/skin.lua b/lua/app/config/skin.lua index b1b9f744..c78a87d3 100644 --- a/lua/app/config/skin.lua +++ b/lua/app/config/skin.lua @@ -47,6 +47,7 @@ local skin = { ["item_id"]=1400201 }, [14003]={ + ["model_id"]="p0028", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=14003 @@ -82,6 +83,7 @@ local skin = { ["hero_id"]=24002 }, [24003]={ + ["model_id"]="p0031", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=24003 @@ -134,6 +136,7 @@ local skin = { ["hero_id"]=34002 }, [34003]={ + ["model_id"]="p0027", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=34003 @@ -191,11 +194,11 @@ local skin = { ["bonus"]={ { ["type"]="atk_purple", - ["num"]=1000000 + ["num"]=300000 }, { ["type"]="attr_hpp_purple", - ["num"]=2000000 + ["num"]=700000 } }, ["got"]=1, @@ -239,6 +242,7 @@ local skin = { ["hero_id"]=54002 }, [54003]={ + ["model_id"]="p0029", ["qlt"]=1, ["skin_point"]=0, ["hero_id"]=54003 diff --git a/lua/app/config/strings/cn/chapter.lua b/lua/app/config/strings/cn/chapter.lua index d3aef2ba..b4c6629d 100644 --- a/lua/app/config/strings/cn/chapter.lua +++ b/lua/app/config/strings/cn/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35.潜艇控制室" + }, + [36]={ + ["name"]="36.海底通道（上）" + }, + [37]={ + ["name"]="37.海底通道（下）" + }, + [38]={ + ["name"]="38.海底峡谷" + }, + [39]={ + ["name"]="39.海底遗迹" + }, + [40]={ + ["name"]="40.海底城堡" } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/equip.lua b/lua/app/config/strings/cn/equip.lua index 06bd01a2..1636df6a 100644 --- a/lua/app/config/strings/cn/equip.lua +++ b/lua/app/config/strings/cn/equip.lua @@ -74,6 +74,21 @@ local equip = { [1400205]={ ["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" }, + [1400301]={ + ["name"]="猫拳,尖刺猫拳,青钢猫拳,裂伤猫拳,破空猫拳,福神之力" + }, + [1400302]={ + ["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠" + }, + [1400303]={ + ["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠" + }, + [1400304]={ + ["name"]="皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链,铜制手环" + }, + [1400305]={ + ["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" + }, [2200101]={ ["name"]="弯刀,狼牙弯刀,飞虹刀,断瀑刀,屠魔刀,斩龙刀" }, @@ -149,6 +164,21 @@ local equip = { [2400205]={ ["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" }, + [2400301]={ + ["name"]="雷锤,闪电雷锤,震荡雷锤,震天雷锤,罚罪雷锤,掣电雷锤" + }, + [2400302]={ + ["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠" + }, + [2400303]={ + ["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠" + }, + [2400304]={ + ["name"]="皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链,铜制手环" + }, + [2400305]={ + ["name"]="铜制手环,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" + }, [3200101]={ ["name"]="长枪,强力长枪,破甲长枪,不屈长枪,狂风之枪,巨人风暴" }, @@ -224,6 +254,21 @@ local equip = { [3400205]={ ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" }, + [3400301]={ + ["name"]="魅心,展颜,玲珑,眸若碧波,灿若繁星,日月失辉" + }, + [3400302]={ + ["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠" + }, + [3400303]={ + ["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍" + }, + [3400304]={ + ["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索" + }, + [3400305]={ + ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" + }, [4200101]={ ["name"]="魔杖,精致魔杖,水晶魔杖,寒冰魔杖,霜星魔杖,雪域冰天" }, @@ -299,6 +344,21 @@ local equip = { [4400205]={ ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" }, + [4400301]={ + ["name"]="法球,蒙尘法球,黯光法球,符文法球,诅咒法球,法老之心" + }, + [4400302]={ + ["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠" + }, + [4400303]={ + ["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍" + }, + [4400304]={ + ["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索" + }, + [4400305]={ + ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" + }, [5200101]={ ["name"]="手里剑,大型手里剑,机关手里剑,疾风手里剑,幽灵手里剑,追影" }, @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" + }, + [5400301]={ + ["name"]="环刃,蛇形环,月牙环,断肠环,离魂环,月痕" + }, + [5400302]={ + ["name"]="凡花木冠,珍珠冠饰,火纹金冠,皎月玉冠,凤冠星冠,至尊魅冠" + }, + [5400303]={ + ["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍" + }, + [5400304]={ + ["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索" + }, + [5400305]={ + ["name"]="紫铁手环,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊御手甲" } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/hero.lua b/lua/app/config/strings/cn/hero.lua index c25ca147..f686bb41 100644 --- a/lua/app/config/strings/cn/hero.lua +++ b/lua/app/config/strings/cn/hero.lua @@ -19,6 +19,10 @@ local hero = { ["name"]="潘达", ["desc"]="潘达厉害的可不止爪子，还有鞭炮。" }, + [14003]={ + ["name"]="皮侍", + ["desc"]="像闪电一样，不停地攻击！！！！" + }, [22001]={ ["name"]="刀妹", ["desc"]="剑一出鞘，必要见血。" @@ -39,6 +43,10 @@ local hero = { ["name"]="索尔", ["desc"]="想试试雷神之锤的威力吗。" }, + [24003]={ + ["name"]="善意", + ["desc"]="手中的太刀如龙飞舞那是无与伦比的剑术。" + }, [32001]={ ["name"]="洋葱头", ["desc"]="盾牌只是为了掩饰下一次突刺。" @@ -59,6 +67,10 @@ local hero = { ["name"]="梦魔", ["desc"]="来找点乐子吧！" }, + [34003]={ + ["name"]="忍者菲尔", + ["desc"]="迅猛如风，保护水之王国免受邪恶势力的侵害。" + }, [42001]={ ["name"]="冰心", ["desc"]="我的心和我的法术一样冰冷。" @@ -79,6 +91,10 @@ local hero = { ["name"]="艳后", ["desc"]="美丽也是一种武器。" }, + [44003]={ + ["name"]="月之法师", + ["desc"]="在她的月轮双刃下，夜晚的星辰在她的指尖舞动，魔法的月光照亮了她无限的智慧~" + }, [52001]={ ["name"]="忍者伦", ["desc"]="虽然带的是手里剑，但是最擅长的还是护盾术，忍者伦最大的愿望还是世界和平。" @@ -98,9 +114,13 @@ local hero = { [54002]={ ["name"]="闪烁法师", ["desc"]="邪恶在此终结。" + }, + [54003]={ + ["name"]="堕落骑士", + ["desc"]="曾经王国中最杰出的骑士之一，命运使他堕落成为一名诅咒巨剑的使用者。" } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index 704d92fb..f1be80af 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="幻影连击：额外造成多次技能伤害。" + }, + [1400320]={ + ["desc"]="炼狱扳机:额外造成多次技能伤害，附加易伤效果，2回合。" + }, + [2400320]={ + ["desc"]="神速一闪:额外造成多次技能伤害，50%概率附加眩晕效果，1回合。" + }, + [3400320]={ + ["desc"]="绝命啃咬:额外造成多次技能伤害，并随机消除3个元素。" + }, + [4400320]={ + ["desc"]="旋转月轮:额外造成多次技能伤害，50%概率附加冻结效果，1回合。" + }, + [5400320]={ + ["desc"]="堕落之剑:额外造成一次大量技能伤害，附加腐败效果，1回合。" } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index 3fbf4ddd..c15b14a0 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -228,13 +228,13 @@ local skill_rogue = { ["desc"]="钢铁重击每连接4个元素则额外发射1个火球造成伤害。" }, [1400200]={ - ["desc"]="解锁熊猫爆竹：额外造成一次大量技能伤害。" + ["desc"]="解锁熊猫爆竹：额外造成一次巨量技能伤害。" }, [1400201]={ - ["desc"]="熊猫爆竹可附加灼烧效果，2回合。" + ["desc"]="熊猫爆竹可附加灼烧效果，2回合。" }, [1400202]={ - ["desc"]="Combo:熊猫爆竹对冻结敌人的伤害增加50%。" + ["desc"]="熊猫爆竹可为团队附加亢奋效果，3回合。" }, [1400203]={ ["desc"]="熊猫爆竹横向可额外消除4个格。" @@ -243,13 +243,13 @@ local skill_rogue = { ["desc"]="潘达普攻时有10%概率附加灼烧效果，2回合。" }, [1400205]={ - ["desc"]="Combo:熊猫爆竹命中冻结敌人时，为团队附加亢奋效果，3回合。" + ["desc"]="熊猫爆竹链接6个元素及以上时将释放2次。" }, [1400206]={ ["desc"]="潘达攻击提升15%。" }, [1400207]={ - ["desc"]="熊猫爆竹链接6个元素及以上时将释放2次。" + ["desc"]="熊猫爆竹攻击将释放2次。" }, [2200100]={ ["desc"]="解锁拔刀斩：额外造成一次技能伤害。" @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="Combo:闪烁法师普攻和反击对诅咒敌人额外造成伤害提高至100%。" + }, + [1400300]={ + ["desc"]="解锁炼狱扳机:额外造成多次技能伤害，附加易伤效果，2回合。" + }, + [1400301]={ + ["desc"]="炼狱扳机可恢复一定量生命。" + }, + [1400302]={ + ["desc"]="Combo:皮侍普攻对虚弱敌人额外增伤。" + }, + [1400303]={ + ["desc"]="炼狱扳机附加的易伤效果提升。" + }, + [1400304]={ + ["desc"]="Combo:皮侍普攻易伤敌人将恢复生命。" + }, + [1400305]={ + ["desc"]="炼狱扳机释放后为团队附加重生效果，1回合。" + }, + [1400306]={ + ["desc"]="皮侍攻击提升15%。" + }, + [1400307]={ + ["desc"]="炼狱扳机附加的重生效果恢复能力增强，回合数+1。" + }, + [2400300]={ + ["desc"]="解锁神速一闪:额外造成多次技能伤害，50%概率附加眩晕效果，1回合。" + }, + [2400301]={ + ["desc"]="神速一闪横向可额外消除4格。" + }, + [2400302]={ + ["desc"]="神速一闪附加的眩晕效果，回合数+1。" + }, + [2400303]={ + ["desc"]="Combo:善意普攻易伤敌人有10%概率附加流血效果，2回合。" + }, + [2400304]={ + ["desc"]="神速一闪纵向可额外消除4格。" + }, + [2400305]={ + ["desc"]="神速一闪每击杀1个敌人，全体攻击提升10%。" + }, + [2400306]={ + ["desc"]="Combo:善意普攻易伤敌人附加流血的概率提升至20%。" + }, + [2400307]={ + ["desc"]="神速一闪击杀敌人后将恢复生命。" + }, + [3400300]={ + ["desc"]="解锁绝命啃咬:额外造成多次技能伤害，并随机消除3个元素。" + }, + [3400301]={ + ["desc"]="绝命啃咬可附加流血效果，2回合。" + }, + [3400302]={ + ["desc"]="绝命啃咬消除的元素提供技能能量*2。" + }, + [3400303]={ + ["desc"]="Combo:忍者菲尔普攻易伤敌人有10%概率附加流血效果，2回合。" + }, + [3400304]={ + ["desc"]="绝命啃咬使用时本次普攻伤害提升。" + }, + [3400305]={ + ["desc"]="绝命啃咬释放后为团队附加反伤效果，2回合。" + }, + [3400306]={ + ["desc"]="绝命啃咬随机消除元素+3。" + }, + [3400307]={ + ["desc"]="绝命啃咬附加反伤效果提升。" + }, + [4400300]={ + ["desc"]="解锁旋转月轮:额外造成多次技能伤害，50%概率附加冻结效果，1回合。" + }, + [4400301]={ + ["desc"]="旋转月轮纵向可额外消除4格。" + }, + [4400302]={ + ["desc"]="Combo:月之法师普攻对眩晕敌人额外增伤" + }, + [4400303]={ + ["desc"]="旋转月轮技能伤害提升。" + }, + [4400304]={ + ["desc"]="旋转月轮附加的冻结效果，回合数+1。" + }, + [4400305]={ + ["desc"]="月之法师普攻有10%概率附加冰霜效果，2回合。" + }, + [4400306]={ + ["desc"]="旋转月轮横向可额外消除4格。" + }, + [4400307]={ + ["desc"]="旋转月轮链接6个元素及以上时，技能攻击额外释放一次。" + }, + [5400300]={ + ["desc"]="解锁堕落之剑:额外造成一次大量技能伤害，附加腐败效果，1回合。" + }, + [5400301]={ + ["desc"]="堕落之剑沿X方向可额外消除4格。" + }, + [5400302]={ + ["desc"]="堕落骑士普攻有10%概率附加中毒效果，2回合。" + }, + [5400303]={ + ["desc"]="堕落之剑附加的腐败效果，回合数+1。" + }, + [5400304]={ + ["desc"]="堕落之剑沿X方向可额外消除4格。" + }, + [5400305]={ + ["desc"]="堕落之剑链接6个元素及以上时，附加昏睡效果，1回合。" + }, + [5400306]={ + ["desc"]="堕落之剑每连接4个元素，技能伤害提升一次。" + }, + [5400307]={ + ["desc"]="堕落之剑附加的昏睡效果，回合数+1。" } } local config = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/skin.lua b/lua/app/config/strings/cn/skin.lua index 790b523a..888ec935 100644 --- a/lua/app/config/strings/cn/skin.lua +++ b/lua/app/config/strings/cn/skin.lua @@ -15,7 +15,7 @@ local skin = { }, [1400201]={ - ["value"]="泳池派对" + ["value"]="沙滩王者" }, [14003]={ diff --git a/lua/app/config/strings/de/chapter.lua b/lua/app/config/strings/de/chapter.lua index 248d88f8..a41bafcf 100644 --- a/lua/app/config/strings/de/chapter.lua +++ b/lua/app/config/strings/de/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/equip.lua b/lua/app/config/strings/de/equip.lua index b25fa7d5..d55c83f4 100644 --- a/lua/app/config/strings/de/equip.lua +++ b/lua/app/config/strings/de/equip.lua @@ -73,6 +73,21 @@ local equip = { }, [1400205]={ + }, + [1400301]={ + + }, + [1400302]={ + + }, + [1400303]={ + + }, + [1400304]={ + + }, + [1400305]={ + }, [2200101]={ @@ -148,6 +163,21 @@ local equip = { }, [2400205]={ + }, + [2400301]={ + + }, + [2400302]={ + + }, + [2400303]={ + + }, + [2400304]={ + + }, + [2400305]={ + }, [3200101]={ @@ -223,6 +253,21 @@ local equip = { }, [3400205]={ + }, + [3400301]={ + + }, + [3400302]={ + + }, + [3400303]={ + + }, + [3400304]={ + + }, + [3400305]={ + }, [4200101]={ @@ -298,6 +343,21 @@ local equip = { }, [4400205]={ + }, + [4400301]={ + + }, + [4400302]={ + + }, + [4400303]={ + + }, + [4400304]={ + + }, + [4400305]={ + }, [5200101]={ @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ + }, + [5400301]={ + + }, + [5400302]={ + + }, + [5400303]={ + + }, + [5400304]={ + + }, + [5400305]={ + } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/hero.lua b/lua/app/config/strings/de/hero.lua index 3cbd38bd..79363cfc 100644 --- a/lua/app/config/strings/de/hero.lua +++ b/lua/app/config/strings/de/hero.lua @@ -13,6 +13,9 @@ local hero = { }, [14002]={ + }, + [14003]={ + }, [22001]={ @@ -28,6 +31,9 @@ local hero = { }, [24002]={ + }, + [24003]={ + }, [32001]={ @@ -43,6 +49,9 @@ local hero = { }, [34002]={ + }, + [34003]={ + }, [42001]={ @@ -58,6 +67,9 @@ local hero = { }, [44002]={ + }, + [44003]={ + }, [52001]={ @@ -73,9 +85,12 @@ local hero = { }, [54002]={ + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill.lua b/lua/app/config/strings/de/skill.lua index 0f224d08..a0df45a0 100644 --- a/lua/app/config/strings/de/skill.lua +++ b/lua/app/config/strings/de/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/de/skill_rogue.lua b/lua/app/config/strings/de/skill_rogue.lua index 8a4cb99a..0c8ed8d3 100644 --- a/lua/app/config/strings/de/skill_rogue.lua +++ b/lua/app/config/strings/de/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/chapter.lua b/lua/app/config/strings/en/chapter.lua index 585bb8fb..be3d74b4 100644 --- a/lua/app/config/strings/en/chapter.lua +++ b/lua/app/config/strings/en/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35. Submarine Control Room" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/equip.lua b/lua/app/config/strings/en/equip.lua index f1e3548d..dfba2125 100644 --- a/lua/app/config/strings/en/equip.lua +++ b/lua/app/config/strings/en/equip.lua @@ -74,6 +74,21 @@ local equip = { [1400205]={ ["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]={ ["name"]="Crescent Blade,Wolf Fang,Celestial Chroma,End of Waterfall,Devilcleaver,Dracobane" }, @@ -149,6 +164,21 @@ local equip = { [2400205]={ ["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]={ ["name"]="Lance,Mighty Lance,Sundering Lance,Unyielding Lance,Galeforce Lance,Titan's Tempest" }, @@ -224,6 +254,21 @@ local equip = { [3400205]={ ["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]={ ["name"]="Wand,Exquisite Wand,Crystal Wand,Glacial Wand,Starfrost Wand,Frost Realm" }, @@ -299,6 +344,21 @@ local equip = { [4400205]={ ["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]={ ["name"]="Shuriken,Large Shuriken,Mechanical Shuriken,Gale Shuriken,Spectral Shuriken,Shadow Tracer" }, @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ ["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 = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/hero.lua b/lua/app/config/strings/en/hero.lua index 6e52cda7..e0bffe2a 100644 --- a/lua/app/config/strings/en/hero.lua +++ b/lua/app/config/strings/en/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="Panda", ["desc"]="Panda's prowess extends beyond its claws—firecrackers add to the spectacle." + }, + [14003]={ + }, [22001]={ ["name"]="Blade Maid", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="Thor", ["desc"]="Want to test the might of Mjolnir?" + }, + [24003]={ + }, [32001]={ ["name"]="Onion", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="Nightmare", ["desc"]="Come have some fun!" + }, + [34003]={ + }, [42001]={ ["name"]="Iceheart", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="Cleopatra", ["desc"]="Beauty wields its own charm as a weapon." + }, + [44003]={ + }, [52001]={ ["name"]="Ninja Lun", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="Twinkling Mage", ["desc"]="Evil meets its demise here and now." + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill.lua b/lua/app/config/strings/en/skill.lua index 379d82b3..0969a487 100644 --- a/lua/app/config/strings/en/skill.lua +++ b/lua/app/config/strings/en/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="Phantom Combo: Deal skill damage multiple times." + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/en/skill_rogue.lua b/lua/app/config/strings/en/skill_rogue.lua index 2cf6bcd0..531e47e6 100644 --- a/lua/app/config/strings/en/skill_rogue.lua +++ b/lua/app/config/strings/en/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="Combo: Twinkling Mage's normal attack and counterattack damage to Curse enemies increase to 100%." + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/chapter.lua b/lua/app/config/strings/es/chapter.lua index 7df9bca4..82c9d3d2 100644 --- a/lua/app/config/strings/es/chapter.lua +++ b/lua/app/config/strings/es/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35. Control del Submarino" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/equip.lua b/lua/app/config/strings/es/equip.lua index fe9f2185..d21dc56f 100644 --- a/lua/app/config/strings/es/equip.lua +++ b/lua/app/config/strings/es/equip.lua @@ -74,6 +74,21 @@ local equip = { [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" }, + [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]={ ["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]={ ["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]={ ["name"]="Lanza,Lanza Poderosa ,Lanza Rompearmaduras,Lanza Indomable,Lanza de Ventarrón,Tormenta de Titán" }, @@ -224,6 +254,21 @@ local equip = { [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" }, + [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]={ ["name"]="Varita Mágica,Varita Delicada,Varita de Cristal,Varita de Hielo,Varita de Escarcha,Reino Nevado" }, @@ -299,6 +344,21 @@ local equip = { [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" }, + [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]={ ["name"]="Shuriken,Shuriken Grande,Shuriken Mecánico,Shuriken de Vendaval,Shuriken de Fantasma,Cazador de Sombras" }, @@ -373,9 +433,24 @@ local equip = { }, [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" + }, + [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 = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/hero.lua b/lua/app/config/strings/es/hero.lua index 1600543a..ca9b0f19 100644 --- a/lua/app/config/strings/es/hero.lua +++ b/lua/app/config/strings/es/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="Panda", ["desc"]="Panda no solo es bueno con las garras, sino también con los petardos." + }, + [14003]={ + }, [22001]={ ["name"]="Chica con Daga", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="Sol", ["desc"]="¿Quieres probar el poder del Martillo de Thor?" + }, + [24003]={ + }, [32001]={ ["name"]="Cabeza de Cebolla", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="Íncubo", ["desc"]="¡Ven a divertirte!" + }, + [34003]={ + }, [42001]={ ["name"]="Alma Glacial", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="Cleopatra", ["desc"]="La belleza también es un arma." + }, + [44003]={ + }, [52001]={ ["name"]="Ninja Jay", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="Mago Brillante", ["desc"]="Aquí se acaba el mal." + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skill.lua b/lua/app/config/strings/es/skill.lua index 26a5b398..1ecc7f18 100644 --- a/lua/app/config/strings/es/skill.lua +++ b/lua/app/config/strings/es/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="Hits de Sombra: causa varios daños de habilidad adicionales." + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/es/skill_rogue.lua b/lua/app/config/strings/es/skill_rogue.lua index 121dc940..522c8114 100644 --- a/lua/app/config/strings/es/skill_rogue.lua +++ b/lua/app/config/strings/es/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="Combo: daño de ataque común y contraataque causado por Mago Brillante a los enemigos Maldecidos aumenta a 100%." + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/chapter.lua b/lua/app/config/strings/fr/chapter.lua index 248d88f8..a41bafcf 100644 --- a/lua/app/config/strings/fr/chapter.lua +++ b/lua/app/config/strings/fr/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/equip.lua b/lua/app/config/strings/fr/equip.lua index b25fa7d5..d55c83f4 100644 --- a/lua/app/config/strings/fr/equip.lua +++ b/lua/app/config/strings/fr/equip.lua @@ -73,6 +73,21 @@ local equip = { }, [1400205]={ + }, + [1400301]={ + + }, + [1400302]={ + + }, + [1400303]={ + + }, + [1400304]={ + + }, + [1400305]={ + }, [2200101]={ @@ -148,6 +163,21 @@ local equip = { }, [2400205]={ + }, + [2400301]={ + + }, + [2400302]={ + + }, + [2400303]={ + + }, + [2400304]={ + + }, + [2400305]={ + }, [3200101]={ @@ -223,6 +253,21 @@ local equip = { }, [3400205]={ + }, + [3400301]={ + + }, + [3400302]={ + + }, + [3400303]={ + + }, + [3400304]={ + + }, + [3400305]={ + }, [4200101]={ @@ -298,6 +343,21 @@ local equip = { }, [4400205]={ + }, + [4400301]={ + + }, + [4400302]={ + + }, + [4400303]={ + + }, + [4400304]={ + + }, + [4400305]={ + }, [5200101]={ @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ + }, + [5400301]={ + + }, + [5400302]={ + + }, + [5400303]={ + + }, + [5400304]={ + + }, + [5400305]={ + } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/hero.lua b/lua/app/config/strings/fr/hero.lua index 3cbd38bd..79363cfc 100644 --- a/lua/app/config/strings/fr/hero.lua +++ b/lua/app/config/strings/fr/hero.lua @@ -13,6 +13,9 @@ local hero = { }, [14002]={ + }, + [14003]={ + }, [22001]={ @@ -28,6 +31,9 @@ local hero = { }, [24002]={ + }, + [24003]={ + }, [32001]={ @@ -43,6 +49,9 @@ local hero = { }, [34002]={ + }, + [34003]={ + }, [42001]={ @@ -58,6 +67,9 @@ local hero = { }, [44002]={ + }, + [44003]={ + }, [52001]={ @@ -73,9 +85,12 @@ local hero = { }, [54002]={ + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill.lua b/lua/app/config/strings/fr/skill.lua index 0f224d08..a0df45a0 100644 --- a/lua/app/config/strings/fr/skill.lua +++ b/lua/app/config/strings/fr/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/fr/skill_rogue.lua b/lua/app/config/strings/fr/skill_rogue.lua index 8a4cb99a..0c8ed8d3 100644 --- a/lua/app/config/strings/fr/skill_rogue.lua +++ b/lua/app/config/strings/fr/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/chapter.lua b/lua/app/config/strings/id/chapter.lua index 1f945b06..685512fe 100644 --- a/lua/app/config/strings/id/chapter.lua +++ b/lua/app/config/strings/id/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35. Kokpit Kapal Selam" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/equip.lua b/lua/app/config/strings/id/equip.lua index e9b680d9..c9defb51 100644 --- a/lua/app/config/strings/id/equip.lua +++ b/lua/app/config/strings/id/equip.lua @@ -74,6 +74,21 @@ local equip = { [1400205]={ ["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]={ ["name"]="Pedang Sabit,Wolf Fang,Kroma Langit,Pedang Air Terjun,Pedang Pembelah Iblis,Pedang Dracobane" }, @@ -149,6 +164,21 @@ local equip = { [2400205]={ ["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]={ ["name"]="Tombak,Tombak Perkasa,Tombak Sunderan,Tombak Pantang Menyerah,Tombak Galeforce,Badai Titan" }, @@ -224,6 +254,21 @@ local equip = { [3400205]={ ["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]={ ["name"]="Tongkat,Tongkat Indah,Tongkat Kristal,Tongkat Glasial,Tongkat Es,Alam Es" }, @@ -299,6 +344,21 @@ local equip = { [4400205]={ ["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]={ ["name"]="Shuriken,Shuriken Besar,Shuriken Mekanik,Shuriken Gale,Shuriken Spektral,Pelacak Bayangan" }, @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ ["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 = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/hero.lua b/lua/app/config/strings/id/hero.lua index a2210654..31d54cce 100644 --- a/lua/app/config/strings/id/hero.lua +++ b/lua/app/config/strings/id/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="Panda", ["desc"]="Panda tidak hanya jago dalam cakarnya, tapi juga dalam petasan." + }, + [14003]={ + }, [22001]={ ["name"]="Gadis Pedang", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="Thor", ["desc"]="Ingin mencoba kekuatan Palu Thor?" + }, + [24003]={ + }, [32001]={ ["name"]="Kepala Bawang", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="Nightmare", ["desc"]="Datang dan bersenang-senanglah!" + }, + [34003]={ + }, [42001]={ ["name"]="Hati Es", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="Cleopatra", ["desc"]="Keindahan juga merupakan senjata." + }, + [44003]={ + }, [52001]={ ["name"]="Ninja Jay", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="Blink Mage", ["desc"]="Di sinilah kejahatan berakhir." + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill.lua b/lua/app/config/strings/id/skill.lua index d836818d..23abfa4f 100644 --- a/lua/app/config/strings/id/skill.lua +++ b/lua/app/config/strings/id/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="Strike Phantom: Menyebabkan beberapa DMG skill tambahan." + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/id/skill_rogue.lua b/lua/app/config/strings/id/skill_rogue.lua index 94de94e4..1fa3318e 100644 --- a/lua/app/config/strings/id/skill_rogue.lua +++ b/lua/app/config/strings/id/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="Combo: Blink Mage Punch dan Serangan Balik memberikan DMG ekstra pada musuh yang terkutuk meningkat menjadi 100%." + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/chapter.lua b/lua/app/config/strings/ja/chapter.lua index a7aeaf5f..ef0875fd 100644 --- a/lua/app/config/strings/ja/chapter.lua +++ b/lua/app/config/strings/ja/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35.潜水艦の制御室" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/equip.lua b/lua/app/config/strings/ja/equip.lua index b5dc69c1..67316067 100644 --- a/lua/app/config/strings/ja/equip.lua +++ b/lua/app/config/strings/ja/equip.lua @@ -74,6 +74,21 @@ local equip = { [1400205]={ ["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド" }, + [1400301]={ + ["name"]="猫の爪,トゲの爪,鋼の爪,裂傷の爪,空を切り裂く爪,福神の力" + }, + [1400302]={ + ["name"]="鋼の仮面,ファインスチール製仮面,黒曜石の冠,勇気の冠,竜角の冠,永遠の冠" + }, + [1400303]={ + ["name"]="厚織りの法衣,薄鋼鉄製ハウバーク,玄鉄の鎧,強者の鎧,竜鱗の鎧,永遠の鎧" + }, + [1400304]={ + ["name"]="革ベルト,黒檀ゴールドのガードル,騎士のベルト,竜腱のガードル,永遠のガードル,銅のブレスレット" + }, + [1400305]={ + ["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド" + }, [2200101]={ ["name"]="クレセントブレード,狼牙,セレスティアルクロマ,滝の終点,デビルクリーバー,斬竜刀" }, @@ -149,6 +164,21 @@ local equip = { [2400205]={ ["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド" }, + [2400301]={ + ["name"]="ミョルニル,ライトニングミョルニル,トレマーミョルニル,スカイシェイキングミョルニル,懺悔のミョルニル,サンダーボルトミョルニル" + }, + [2400302]={ + ["name"]="鋼の仮面,ファインスチール製仮面,黒曜石の冠,勇気の冠,竜角の冠,永遠の冠" + }, + [2400303]={ + ["name"]="厚織りの法衣,薄鋼鉄製ハウバーク,玄鉄の鎧,強者の鎧,竜鱗の鎧,永遠の鎧" + }, + [2400304]={ + ["name"]="革ベルト,黒檀ゴールドのガードル,騎士のベルト,竜腱のガードル,永遠のガードル,銅のブレスレット" + }, + [2400305]={ + ["name"]="銅のブレスレット,革リストバンド,鉄のリストバンド,ヒーローのガントレット,竜鬚のリストバンド,永遠のリストバンド" + }, [3200101]={ ["name"]="ランス,強力なランス,鎧破りのランス,不屈のランス,狂風のランス,巨人ストーム" }, @@ -224,6 +254,21 @@ local equip = { [3400205]={ ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" }, + [3400301]={ + ["name"]="チャームハート,晴れやかな笑顔,玲瓏,サファイアの輝き,星の如く,日食" + }, + [3400302]={ + ["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし" + }, + [3400303]={ + ["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ" + }, + [3400304]={ + ["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ" + }, + [3400305]={ + ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" + }, [4200101]={ ["name"]="魔法の杖,精巧な杖,水晶の杖,氷の杖,霜星の杖,氷雪の世界" }, @@ -299,6 +344,21 @@ local equip = { [4400205]={ ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" }, + [4400301]={ + ["name"]="オーブ,ダストベールドオーブ,トワイライトオーブ,ルーンオーブ,呪いのオーブ,ファラオの心" + }, + [4400302]={ + ["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし" + }, + [4400303]={ + ["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ" + }, + [4400304]={ + ["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ" + }, + [4400305]={ + ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" + }, [5200101]={ ["name"]="手裏剣,大型手裏剣,機関手裏剣,疾風手裏剣,幽霊手裏剣,影を追う" }, @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" + }, + [5400301]={ + ["name"]="チャクラム,サーペントチャクラム,三日月チャクラム,ハートブレイクリング,ソウルリフトリング,月の痕" + }, + [5400302]={ + ["name"]="花の冠,真珠の冠飾,炎紋様の金冠,月の玉冠,鳳冠の星冠,至高のかんざし" + }, + [5400303]={ + ["name"]="柔らかいローブ,翡翠飾りのローブ,紫絹のローブ,琥珀のローブ,鳳凰の羽のローブ,究極のローブ" + }, + [5400304]={ + ["name"]="シンプルな刺繍テープ,エレガントなウエストバンド,パールの刺繍テープ,スターライトの刺繍テープ,鳳凰の刺繍テープ,究極の刺繍テープ" + }, + [5400305]={ + ["name"]="紫鉄のブレスレット,ベールのガントレット,ゴールドのガントレット,星のガントレット,鳳凰のガントレット,究極のガントレット" } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/hero.lua b/lua/app/config/strings/ja/hero.lua index 8113eefd..ef49bd68 100644 --- a/lua/app/config/strings/ja/hero.lua +++ b/lua/app/config/strings/ja/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="パンダ", ["desc"]="引っ掻きはもちろん、クラッカーも得意なんだぜ。" + }, + [14003]={ + }, [22001]={ ["name"]="ブレードメイド", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="ソー", ["desc"]="試してみるか、こいつの威力を。" + }, + [24003]={ + }, [32001]={ ["name"]="タマネギ", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="夢魔", ["desc"]="一緒に楽しもう！" + }, + [34003]={ + }, [42001]={ ["name"]="氷心", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="クレオパトラ", ["desc"]="美しさだって立派な武器です。" + }, + [44003]={ + }, [52001]={ ["name"]="忍者リン", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="トゥインクリングメイジ", ["desc"]="ここが邪悪なるものの終着点。" + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill.lua b/lua/app/config/strings/ja/skill.lua index c77aa9c4..42b58367 100644 --- a/lua/app/config/strings/ja/skill.lua +++ b/lua/app/config/strings/ja/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="ファントムヒット：追加でスキルを複数回発動する。" + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ja/skill_rogue.lua b/lua/app/config/strings/ja/skill_rogue.lua index 735c2f48..25fa7fef 100644 --- a/lua/app/config/strings/ja/skill_rogue.lua +++ b/lua/app/config/strings/ja/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="ヒット:トゥインクリングメイジの通常攻撃と反撃は呪い状態の敵にダメージが100%アップ。" + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/chapter.lua b/lua/app/config/strings/ko/chapter.lua index 967b5468..9f4bb4dc 100644 --- a/lua/app/config/strings/ko/chapter.lua +++ b/lua/app/config/strings/ko/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35. 잠수함 통제실" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/equip.lua b/lua/app/config/strings/ko/equip.lua index 8fed8cb6..e070ea55 100644 --- a/lua/app/config/strings/ko/equip.lua +++ b/lua/app/config/strings/ko/equip.lua @@ -74,6 +74,21 @@ local equip = { [1400205]={ ["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대" }, + [1400301]={ + ["name"]="고양이 펀치,손톱 세운 고양이 펀치,브론즈 고양이 펀치,거친 고양이 펀치,무시무시한 고양이 펀치,행운의 신이 내린 축복" + }, + [1400302]={ + ["name"]="거친 강철 마스크,정교한 강철 마스크,어둠의 노블 왕관,용맹의 왕관,용의 뿔로 만든 왕관,화려한 영원의 왕관" + }, + [1400303]={ + ["name"]="두꺼운 니트 두루마기,얇은 강철 갑옷,검은 빛을 띤 무거운 중갑,강자의 옥 갑옷,용비늘 황금 투구,영원의 중갑" + }, + [1400304]={ + ["name"]="가죽 벨트,검은 황금 허리띠,기사의 벨트,용의 힘줄 허리띠,영원의 허리띠 장식,브론즈 팔찌" + }, + [1400305]={ + ["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대" + }, [2200101]={ ["name"]="굽이칼,늑대의 굽이칼,하늘의 크로마 칼,폭포를 가르는 칼,악마 도살 칼,드래곤 슬레이어" }, @@ -149,6 +164,21 @@ local equip = { [2400205]={ ["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대" }, + [2400301]={ + ["name"]="묠니르,번개 묠니르,땅을 가르는 묠니르,하늘을 울리는 묠니르,처벌의 묠니르,궁극의 묠니르" + }, + [2400302]={ + ["name"]="거친 강철 마스크,정교한 강철 마스크,어둠의 노블 왕관,용맹의 왕관,용의 뿔로 만든 왕관,화려한 영원의 왕관" + }, + [2400303]={ + ["name"]="두꺼운 니트 두루마기,얇은 강철 갑옷,검은 빛을 띤 무거운 중갑,강자의 옥 갑옷,용비늘 황금 투구,영원의 중갑" + }, + [2400304]={ + ["name"]="가죽 벨트,검은 황금 허리띠,기사의 벨트,용의 힘줄 허리띠,영원의 허리띠 장식,브론즈 팔찌" + }, + [2400305]={ + ["name"]="브론즈 팔찌,가죽 손목 밴드,철의 심장 손목 밴드,영웅 건틀릿,용수염 아대,영원의 아대" + }, [3200101]={ ["name"]="파이크,강력한 파이크,관통의 파이크,불굴의 파이크,강풍의 파이크,거대한 폭풍" }, @@ -224,6 +254,21 @@ local equip = { [3400205]={ ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" }, + [3400301]={ + ["name"]="매력의 심장,아름다운 미소,정교한 아름다움,마음을 사로잡는 눈빛,찬란한 별,빛을 잃은 해와 달" + }, + [3400302]={ + ["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관" + }, + [3400303]={ + ["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브" + }, + [3400304]={ + ["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트" + }, + [3400305]={ + ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" + }, [4200101]={ ["name"]="마법 지팡이,정교한 지팡이,수정 지팡이,얼음의 지팡이,서리빛 지팡이,얼어붙은 세상" }, @@ -299,6 +344,21 @@ local equip = { [4400205]={ ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" }, + [4400301]={ + ["name"]="마법 구슬,먼지 덮인 마법 구슬,어두운 빛의 마법 구슬,룬 마법 구슬,저주의 마법 구슬,파라오의 심장" + }, + [4400302]={ + ["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관" + }, + [4400303]={ + ["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브" + }, + [4400304]={ + ["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트" + }, + [4400305]={ + ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" + }, [5200101]={ ["name"]="수리검,대형 수리검,메커니즘 수리검,매우 빠른 수리검,유령 수리검,그림자 사냥꾼" }, @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" + }, + [5400301]={ + ["name"]="차크람,뱀 형태의 차크람,초승달 차크람,자비 없는 차크람,영혼 분리 차크람,달의 흔적" + }, + [5400302]={ + ["name"]="꽃나무 티아라,진주 티아라,불 무늬 티아라,밝은 달 티아라,빛나는 봉황 티아라,최고의 매력 왕관" + }, + [5400303]={ + ["name"]="부드러운 가죽 내복,옥 장식 로브,보라색 실크 원단,엠버 컬러 옷,봉황 깃털 로브,존귀한 별 로브" + }, + [5400304]={ + ["name"]="심플한 자수 벨트,우아한 허리띠,진주 자수 벨트,별빛 영광의 벨트,봉황의 눈빛 허리띠,존귀한 불멸의 벨트" + }, + [5400305]={ + ["name"]="보라색 아이언 팔찌,베일 건틀릿,화려한 황금 건틀릿,스텔라 건틀릿,봉황의 뼈 건틀릿,존귀한 영광의 아머" } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/hero.lua b/lua/app/config/strings/ko/hero.lua index 28f8702b..e9d5acbb 100644 --- a/lua/app/config/strings/ko/hero.lua +++ b/lua/app/config/strings/ko/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="판다", ["desc"]="판다는 날카로운 발톱을 가졌을 뿐만아니라 폭죽도 잘 터트립니다." + }, + [14003]={ + }, [22001]={ ["name"]="블레이드", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="토르", ["desc"]="토르의 망치가 가진 힘을 시험해보고 싶은 건가?" + }, + [24003]={ + }, [32001]={ ["name"]="양파 헤드", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="인큐버스", ["desc"]="재밌게 놀아보자고!" + }, + [34003]={ + }, [42001]={ ["name"]="얼음의 심장", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="클레오파트라", ["desc"]="아름다움도 무기라고 할 수 있죠." + }, + [44003]={ + }, [52001]={ ["name"]="닌자 룬", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="반짝이는 마법사", ["desc"]="여기가 바로 악의 무덤이야." + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill.lua b/lua/app/config/strings/ko/skill.lua index 0a6410b2..1b0132a3 100644 --- a/lua/app/config/strings/ko/skill.lua +++ b/lua/app/config/strings/ko/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="팬텀 콤보: 여러 번의 스킬 피해를 추가로 입힙니다." + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ko/skill_rogue.lua b/lua/app/config/strings/ko/skill_rogue.lua index 82d1adfd..199c90cb 100644 --- a/lua/app/config/strings/ko/skill_rogue.lua +++ b/lua/app/config/strings/ko/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="Combo: 반짝이는 마법사의 일반 공격과 반격이 저주 받은 적에게 추가로 입히는 대미지가 100%로 증가합니다." + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/chapter.lua b/lua/app/config/strings/pt/chapter.lua index 33579e12..9522c82a 100644 --- a/lua/app/config/strings/pt/chapter.lua +++ b/lua/app/config/strings/pt/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35. Sala de Controle do Submarino" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/equip.lua b/lua/app/config/strings/pt/equip.lua index 38ec0a54..c52e2d59 100644 --- a/lua/app/config/strings/pt/equip.lua +++ b/lua/app/config/strings/pt/equip.lua @@ -74,6 +74,21 @@ local equip = { [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" }, + [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]={ ["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]={ ["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]={ ["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]={ ["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]={ ["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]={ ["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]={ ["name"]="Shuriken,Shuriken Grande,Shuriken Mecânica,Shuriken do Vendaval,Shuriken Fantasmagórica,Perseguidor de Sombras" }, @@ -373,9 +433,24 @@ local equip = { }, [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" + }, + [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 = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/hero.lua b/lua/app/config/strings/pt/hero.lua index dd5e5ca1..92230660 100644 --- a/lua/app/config/strings/pt/hero.lua +++ b/lua/app/config/strings/pt/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="Panda", ["desc"]="O Panda não é apenas incrível com suas garras, mas também com fogos de artifício." + }, + [14003]={ + }, [22001]={ ["name"]="Senhorita dos Gumes", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="Thor", ["desc"]="Quer experimentar o poder do martelo de Thor?" + }, + [24003]={ + }, [32001]={ ["name"]="Cabeça de Cebola", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="Súcubo", ["desc"]="Vamos nos divertir!" + }, + [34003]={ + }, [42001]={ ["name"]="Alma Glacial", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="Cleópatra", ["desc"]="A beleza também é uma arma." + }, + [44003]={ + }, [52001]={ ["name"]="Luninja", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="Mago do Brilho", ["desc"]="O mal termina aqui." + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill.lua b/lua/app/config/strings/pt/skill.lua index c979a13b..477e3cc7 100644 --- a/lua/app/config/strings/pt/skill.lua +++ b/lua/app/config/strings/pt/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="Ataque Fantasma: Causa múltiplos danos de habilidade adicionais." + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/pt/skill_rogue.lua b/lua/app/config/strings/pt/skill_rogue.lua index e4f38abd..48a2362e 100644 --- a/lua/app/config/strings/pt/skill_rogue.lua +++ b/lua/app/config/strings/pt/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="Combo: Ataque normal e contra-ataque do Mago do Lampejo causam dano adicional a inimigos amaldiçoados, aumentando para 100%." + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/chapter.lua b/lua/app/config/strings/ru/chapter.lua index 248d88f8..a41bafcf 100644 --- a/lua/app/config/strings/ru/chapter.lua +++ b/lua/app/config/strings/ru/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/equip.lua b/lua/app/config/strings/ru/equip.lua index b25fa7d5..d55c83f4 100644 --- a/lua/app/config/strings/ru/equip.lua +++ b/lua/app/config/strings/ru/equip.lua @@ -73,6 +73,21 @@ local equip = { }, [1400205]={ + }, + [1400301]={ + + }, + [1400302]={ + + }, + [1400303]={ + + }, + [1400304]={ + + }, + [1400305]={ + }, [2200101]={ @@ -148,6 +163,21 @@ local equip = { }, [2400205]={ + }, + [2400301]={ + + }, + [2400302]={ + + }, + [2400303]={ + + }, + [2400304]={ + + }, + [2400305]={ + }, [3200101]={ @@ -223,6 +253,21 @@ local equip = { }, [3400205]={ + }, + [3400301]={ + + }, + [3400302]={ + + }, + [3400303]={ + + }, + [3400304]={ + + }, + [3400305]={ + }, [4200101]={ @@ -298,6 +343,21 @@ local equip = { }, [4400205]={ + }, + [4400301]={ + + }, + [4400302]={ + + }, + [4400303]={ + + }, + [4400304]={ + + }, + [4400305]={ + }, [5200101]={ @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ + }, + [5400301]={ + + }, + [5400302]={ + + }, + [5400303]={ + + }, + [5400304]={ + + }, + [5400305]={ + } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/hero.lua b/lua/app/config/strings/ru/hero.lua index 3cbd38bd..79363cfc 100644 --- a/lua/app/config/strings/ru/hero.lua +++ b/lua/app/config/strings/ru/hero.lua @@ -13,6 +13,9 @@ local hero = { }, [14002]={ + }, + [14003]={ + }, [22001]={ @@ -28,6 +31,9 @@ local hero = { }, [24002]={ + }, + [24003]={ + }, [32001]={ @@ -43,6 +49,9 @@ local hero = { }, [34002]={ + }, + [34003]={ + }, [42001]={ @@ -58,6 +67,9 @@ local hero = { }, [44002]={ + }, + [44003]={ + }, [52001]={ @@ -73,9 +85,12 @@ local hero = { }, [54002]={ + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill.lua b/lua/app/config/strings/ru/skill.lua index 0f224d08..a0df45a0 100644 --- a/lua/app/config/strings/ru/skill.lua +++ b/lua/app/config/strings/ru/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/ru/skill_rogue.lua b/lua/app/config/strings/ru/skill_rogue.lua index 8a4cb99a..0c8ed8d3 100644 --- a/lua/app/config/strings/ru/skill_rogue.lua +++ b/lua/app/config/strings/ru/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/chapter.lua b/lua/app/config/strings/th/chapter.lua index ad3b8baa..f2065910 100644 --- a/lua/app/config/strings/th/chapter.lua +++ b/lua/app/config/strings/th/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35. ห้องควบคุมเรือดำน้ำ" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/equip.lua b/lua/app/config/strings/th/equip.lua index b433994b..31b2845b 100644 --- a/lua/app/config/strings/th/equip.lua +++ b/lua/app/config/strings/th/equip.lua @@ -74,6 +74,21 @@ local equip = { [1400205]={ ["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์" }, + [1400301]={ + ["name"]="หมัดแมว,หมัดแมวหนามแหลม,หมัดแมวเหล็กเขียว,หมัดแมวฉีกขาด,หมัดแมวทะลวง,พลังเทพโชคลาภ" + }, + [1400302]={ + ["name"]="เกราะหน้าเหล็กหยาบ,เกราะหน้าเหล็กเลิศ,มงกุฎออบซิเดียน,มงกุฎกล้าหาญ,มงกุฎเขามังกร,มงกุฎนิรันดร์" + }, + [1400303]={ + ["name"]="เสื้อยาวถักหนา,เกราะวงแหวนเหล็กบาง,เกราะหนักเหล็ก,เกราะหยกผู้แข็งแกร่ง,บุตรขุนนางเกล็ดมังกร,เกราะหนักนิรันดร์" + }, + [1400304]={ + ["name"]="เข็มขัดหนัง,คอร์เซ็ททอง,แหวนเอวอัศวิน,คอร์เซ็ทเอ็นมังกร,ห่วงโซ่เอวนิรันดร์,สร้อยข้อมือทองแดง" + }, + [1400305]={ + ["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์" + }, [2200101]={ ["name"]="มีดโค้ง,มีดโค้งฟันหมาป่า,มีดเจาะรุ้ง,มีดตัดน้ำตก,มีดสังหารปีศาจ,มีดสังหารมังกร" }, @@ -149,6 +164,21 @@ local equip = { [2400205]={ ["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์" }, + [2400301]={ + ["name"]="ค้อนสายฟ้า,ค้อนสายฟ้าผ่า,ค้อนสายฟ้าสั่น,ค้อนสายฟ้าเขย่าโลก,ค้อนสายฟ้าลงโทษ,ค้อนสายฟ้าทรงพลัง" + }, + [2400302]={ + ["name"]="เกราะหน้าเหล็กหยาบ,เกราะหน้าเหล็กเลิศ,มงกุฎออบซิเดียน,มงกุฎกล้าหาญ,มงกุฎเขามังกร,มงกุฎนิรันดร์" + }, + [2400303]={ + ["name"]="เสื้อยาวถักหนา,เกราะวงแหวนเหล็กบาง,เกราะหนักเหล็ก,เกราะหยกผู้แข็งแกร่ง,บุตรขุนนางเกล็ดมังกร,เกราะหนักนิรันดร์" + }, + [2400304]={ + ["name"]="เข็มขัดหนัง,คอร์เซ็ททอง,แหวนเอวอัศวิน,คอร์เซ็ทเอ็นมังกร,ห่วงโซ่เอวนิรันดร์,สร้อยข้อมือทองแดง" + }, + [2400305]={ + ["name"]="สร้อยข้อมือทองแดง,สายรัดข้อมือหนัง,สายรัดข้อมือเฉยเมย,ถุงมือฮีโร่,สายรัดข้อมือหนวดมังกร,ล้อข้อมือนิรันดร์" + }, [3200101]={ ["name"]="หอกยาว,หอกยาวทรงพลัง,หอกยาวเจาะเกราะ,หอกยาวไม่ย่อท้อ,หอกลม,พายุยักษ์" }, @@ -224,6 +254,21 @@ local equip = { [3400205]={ ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" }, + [3400301]={ + ["name"]="หัวใจเสน่ห์,งดงาม,ระจุ๋มกระจิ๋ม,ดวงตาเหมือนคลื่นชดใส,ส่องแสงเหมือนดวงดาว,ความมันวาวหายไป" + }, + [3400302]={ + ["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม" + }, + [3400303]={ + ["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม" + }, + [3400304]={ + ["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม" + }, + [3400305]={ + ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" + }, [4200101]={ ["name"]="คทาวิเศษ,คทาวิเศษสวยงาม,คทาวิเศษคริสตัล,คทาวิเศษน้ำแข็ง,คทาวิเศษดาวค้าง,ดินแดนหิมะ" }, @@ -299,6 +344,21 @@ local equip = { [4400205]={ ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" }, + [4400301]={ + ["name"]="บอลวิเศษ,บอลวิเศษฝุ่น,บอลวิเศษมืด,บอลวิเศษรูน,บอลวิเศษสาป,หัวใจของฟาโรห์" + }, + [4400302]={ + ["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม" + }, + [4400303]={ + ["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม" + }, + [4400304]={ + ["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม" + }, + [4400305]={ + ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" + }, [5200101]={ ["name"]="ชูริเคน,ชูริเคนขนาดใหญ่,ชูริเคนกลไก,ชูริเคนลมแรง,ชูริเคนผี,ไล่ตามเงา" }, @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" + }, + [5400301]={ + ["name"]="จักร,จักรงู,จักรวงเดือน,จักรสังหาร,จักรแยกวิญญาณ,ร่องรอยจันทร์" + }, + [5400302]={ + ["name"]="มงกุฎไม้ดอก,มงกุฎมุก,มงกุฎทองลายไฟ,มงกุฎหยกจันทร์,มงกุฎดาวฟีนิกซ์,มงกุฏมหาเสน่ห์สุพรีม" + }, + [5400303]={ + ["name"]="เสื้อชั้นในหนัง,เสื้อคลุมหยก,ผ้าซาตินสีม่วง,ชุดแสดงสีเหลืองอำพัน,ชุดขนนกฟีนิกซ์,เสื้อคลุมดาวสุพรีม" + }, + [5400304]={ + ["name"]="ริบบิ้นปักเรียบง่าย,คอร์เซ็ทสง่างาม,ริบบิ้นปักมุก,เข็มขัดแสงดาว,เข็มขัดดาฟีนิกซ์,เชือกเซียนสุพรีม" + }, + [5400305]={ + ["name"]="สร้อยข้อมือเหล็กม่วง,ถุงมือเส้นด้าย,ถุงมือทอง,ถุงมือดวงดาว,ถุงมือกระดูกฟีนิกซ์,เกราะมือสุพรีม" } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/hero.lua b/lua/app/config/strings/th/hero.lua index d74c307a..2ff4c341 100644 --- a/lua/app/config/strings/th/hero.lua +++ b/lua/app/config/strings/th/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="แพนด้า", ["desc"]="แพนด้าไม่เพียงเก่งเรื่องกรงเล็บ แต่ยังประทัดอีกด้วย" + }, + [14003]={ + }, [22001]={ ["name"]="สาวดาบ", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="โซล", ["desc"]="อยากทอดลองพลังของค้อนของเทพสายฟ้าไหม?" + }, + [24003]={ + }, [32001]={ ["name"]="หัวหอม", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="ฝันร้าย", ["desc"]="มาสนุกกันเถอะ!" + }, + [34003]={ + }, [42001]={ ["name"]="หัวใจน้ำแข็ง", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="คลีโอพัตรา", ["desc"]="ความงามก็เป็นอาวุธชนิดหนึ่ง" + }, + [44003]={ + }, [52001]={ ["name"]="นินจาเร็น", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="นักเวทแวบวับ", ["desc"]="ความชั่วร้ายจะจบลงที่นี่" + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill.lua b/lua/app/config/strings/th/skill.lua index b9203aff..bd365a80 100644 --- a/lua/app/config/strings/th/skill.lua +++ b/lua/app/config/strings/th/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="เงามายาคอมโบ: สร้างคดาเมจสกิลเพิ่มเติมหลายครั้ง" + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/th/skill_rogue.lua b/lua/app/config/strings/th/skill_rogue.lua index 8592b04d..7d088aaf 100644 --- a/lua/app/config/strings/th/skill_rogue.lua +++ b/lua/app/config/strings/th/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="คอมโบ: ดาเมจเพิ่มเติมของการโจมตีทั่วไปและโต้กลับของนักเวทแวบวับที่สร้างให้กับศัตรูคำสาปเพิ่มขึ้นถึง100%" + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/chapter.lua b/lua/app/config/strings/vi/chapter.lua index ff9b241e..6fd48b4c 100644 --- a/lua/app/config/strings/vi/chapter.lua +++ b/lua/app/config/strings/vi/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35.Phòng Điều Khiển Tàu Ngầm" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/equip.lua b/lua/app/config/strings/vi/equip.lua index a46c3a1a..329d2263 100644 --- a/lua/app/config/strings/vi/equip.lua +++ b/lua/app/config/strings/vi/equip.lua @@ -74,6 +74,21 @@ local equip = { [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" }, + [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]={ ["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]={ ["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]={ ["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]={ ["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]={ ["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]={ ["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]={ ["name"]="Shuriken ,Shuriken Lớn,Shuriken Cơ Quan,Shuriken Tật Phong,Shuriken U Linh,Truy Ảnh" }, @@ -373,9 +433,24 @@ local equip = { }, [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" + }, + [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 = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/hero.lua b/lua/app/config/strings/vi/hero.lua index 2107447a..e4c4fbd9 100644 --- a/lua/app/config/strings/vi/hero.lua +++ b/lua/app/config/strings/vi/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="Panda", ["desc"]="Panda không chỉ có móng vuốt lợi hại, mà còn có pháo nổ." + }, + [14003]={ + }, [22001]={ ["name"]="Irelia", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="Thor", ["desc"]="Muốn nếm thử uy lực của Búa Thor không." + }, + [24003]={ + }, [32001]={ ["name"]="Onion", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="Incubus", ["desc"]="Đến tìm chút niềm vui nào!" + }, + [34003]={ + }, [42001]={ ["name"]="Frozen Heart", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="Cleopatra", ["desc"]="Xinh đẹp cũng là 1 loại vũ khí." + }, + [44003]={ + }, [52001]={ ["name"]="Ninja Jay", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="Pháp Sư Blink", ["desc"]="Tà ác sẽ chấm dứt tại đây." + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill.lua b/lua/app/config/strings/vi/skill.lua index bb7dc307..b6936d67 100644 --- a/lua/app/config/strings/vi/skill.lua +++ b/lua/app/config/strings/vi/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["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 = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/vi/skill_rogue.lua b/lua/app/config/strings/vi/skill_rogue.lua index e174dda2..277c3de6 100644 --- a/lua/app/config/strings/vi/skill_rogue.lua +++ b/lua/app/config/strings/vi/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="Combo: Pháp Sư Blink đánh thường và Phản Đòn gây thêm sát thương lên kẻ địch Lời Nguyền tăng đến 100%." + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/chapter.lua b/lua/app/config/strings/zh/chapter.lua index 2b30f30f..b115f125 100644 --- a/lua/app/config/strings/zh/chapter.lua +++ b/lua/app/config/strings/zh/chapter.lua @@ -103,9 +103,24 @@ local chapter = { }, [35]={ ["name"]="35.潛艇控制室" + }, + [36]={ + + }, + [37]={ + + }, + [38]={ + + }, + [39]={ + + }, + [40]={ + } } local config = { -data=chapter,count=35 +data=chapter,count=40 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/equip.lua b/lua/app/config/strings/zh/equip.lua index 382f3504..cab78783 100644 --- a/lua/app/config/strings/zh/equip.lua +++ b/lua/app/config/strings/zh/equip.lua @@ -74,6 +74,21 @@ local equip = { [1400205]={ ["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪" }, + [1400301]={ + ["name"]="貓拳,尖刺貓拳,青鋼貓拳,裂傷貓拳,破空貓拳,福神之力" + }, + [1400302]={ + ["name"]="粗鋼面甲,精鋼面盔,黑曜貴冠,英勇冠冕,龍角之冠,永恆華冠" + }, + [1400303]={ + ["name"]="厚織長衫,薄鋼環甲,玄鐵重甲,強者玉甲,龍鱗金冑,永恆重鎧" + }, + [1400304]={ + ["name"]="皮革腰帶,烏金束腰,騎士腰環,龍筋束腰,永恆腰鏈,銅製手環" + }, + [1400305]={ + ["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪" + }, [2200101]={ ["name"]="彎刀,狼牙彎刀,飛虹刀,斷瀑刀,屠魔刀,斬龍刀" }, @@ -149,6 +164,21 @@ local equip = { [2400205]={ ["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪" }, + [2400301]={ + ["name"]="雷錘,閃電雷錘,震盪雷錘,震天雷錘,罰罪雷錘,掣電雷錘" + }, + [2400302]={ + ["name"]="粗鋼面甲,精鋼面盔,黑曜貴冠,英勇冠冕,龍角之冠,永恆華冠" + }, + [2400303]={ + ["name"]="厚織長衫,薄鋼環甲,玄鐵重甲,強者玉甲,龍鱗金冑,永恆重鎧" + }, + [2400304]={ + ["name"]="皮革腰帶,烏金束腰,騎士腰環,龍筋束腰,永恆腰鏈,銅製手環" + }, + [2400305]={ + ["name"]="銅製手環,皮革腕帶,鐵心腕帶,英雄護手,龍鬚護腕,永恆腕輪" + }, [3200101]={ ["name"]="長槍,強力長槍,破甲長槍,不屈長槍,狂風之槍,巨人風暴" }, @@ -224,6 +254,21 @@ local equip = { [3400205]={ ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" }, + [3400301]={ + ["name"]="魅心,展顏,玲瓏,眸若碧波,燦若繁星,日月失輝" + }, + [3400302]={ + ["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠" + }, + [3400303]={ + ["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍" + }, + [3400304]={ + ["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索" + }, + [3400305]={ + ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" + }, [4200101]={ ["name"]="魔杖,精緻魔杖,水晶魔杖,寒冰魔杖,霜星魔杖,雪域冰天" }, @@ -299,6 +344,21 @@ local equip = { [4400205]={ ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" }, + [4400301]={ + ["name"]="法球,蒙塵法球,黯光法球,符文法球,詛咒法球,法老之心" + }, + [4400302]={ + ["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠" + }, + [4400303]={ + ["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍" + }, + [4400304]={ + ["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索" + }, + [4400305]={ + ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" + }, [5200101]={ ["name"]="手裏劍,大型手裏劍,機關手裏劍,疾風手裏劍,幽靈手裏劍,追影" }, @@ -373,9 +433,24 @@ local equip = { }, [5400205]={ ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" + }, + [5400301]={ + ["name"]="環刃,蛇形環,月牙環,斷腸環,離魂環,月痕" + }, + [5400302]={ + ["name"]="凡花木冠,珍珠冠飾,火紋金冠,皎月玉冠,鳳冠星冠,至尊魅冠" + }, + [5400303]={ + ["name"]="軟革裡衣,綴玉長袍,紫紗綢緞,琥珀彩衣,鳳羽華裝,至尊星袍" + }, + [5400304]={ + ["name"]="簡約繡帶,優雅束腰,珍珠繡帶,星光御帶,鳳眸束帶,至尊仙索" + }, + [5400305]={ + ["name"]="紫鐵手環,輕紗護手,黃金華護,星辰護手,鳳骨護手,至尊御手甲" } } local config = { -data=equip,count=125 +data=equip,count=150 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/hero.lua b/lua/app/config/strings/zh/hero.lua index 3535aaf6..3fb55495 100644 --- a/lua/app/config/strings/zh/hero.lua +++ b/lua/app/config/strings/zh/hero.lua @@ -18,6 +18,9 @@ local hero = { [14002]={ ["name"]="潘達", ["desc"]="潘達厲害的可不止爪子，還有鞭炮。" + }, + [14003]={ + }, [22001]={ ["name"]="刀妹", @@ -38,6 +41,9 @@ local hero = { [24002]={ ["name"]="索爾", ["desc"]="想試試雷神之鎚的威力嗎。" + }, + [24003]={ + }, [32001]={ ["name"]="洋蔥頭", @@ -58,6 +64,9 @@ local hero = { [34002]={ ["name"]="夢魔", ["desc"]="來找點樂子吧！" + }, + [34003]={ + }, [42001]={ ["name"]="冰心", @@ -78,6 +87,9 @@ local hero = { [44002]={ ["name"]="豔后", ["desc"]="美麗也是一種武器。" + }, + [44003]={ + }, [52001]={ ["name"]="忍者倫", @@ -98,9 +110,12 @@ local hero = { [54002]={ ["name"]="閃爍法師", ["desc"]="邪惡在此終結。" + }, + [54003]={ + } } local config = { -data=hero,count=25 +data=hero,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill.lua b/lua/app/config/strings/zh/skill.lua index 2ce66421..7cc3f3d5 100644 --- a/lua/app/config/strings/zh/skill.lua +++ b/lua/app/config/strings/zh/skill.lua @@ -73,9 +73,24 @@ local skill = { }, [5400220]={ ["desc"]="幻影連擊：額外造成數次技能傷害。" + }, + [1400320]={ + + }, + [2400320]={ + + }, + [3400320]={ + + }, + [4400320]={ + + }, + [5400320]={ + } } local config = { -data=skill,count=25 +data=skill,count=30 } return config \ No newline at end of file diff --git a/lua/app/config/strings/zh/skill_rogue.lua b/lua/app/config/strings/zh/skill_rogue.lua index 003f0ac4..95fc40e5 100644 --- a/lua/app/config/strings/zh/skill_rogue.lua +++ b/lua/app/config/strings/zh/skill_rogue.lua @@ -730,9 +730,129 @@ local skill_rogue = { }, [5400207]={ ["desc"]="Combo:閃爍法師普攻和反擊對詛咒敵人額外造成傷害提高至100%。" + }, + [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 = { -data=skill_rogue,count=244 +data=skill_rogue,count=284 } return config \ No newline at end of file diff --git a/lua/app/global/global_const.lua b/lua/app/global/global_const.lua index 17ff189a..77e83df2 100644 --- a/lua/app/global/global_const.lua +++ b/lua/app/global/global_const.lua @@ -468,6 +468,15 @@ GConst.HERO_FRAME_BG_QLT = { [7] = "hero_frame_bg_7", } +GConst.QLT_COLOR = { + [1] = "#aef1ff", + [2] = "#9aff9cz", + [3] = "#aef1ff", + [4] = "#f6aeff", + [5] = "#f6aeff", + [6] = "#f6aeff", +} + GConst.QLT_LABLE = { DEFAULT = "equip_quality_1", GRAY = "equip_quality_1", diff --git a/lua/app/module/collection/collection_manager.lua b/lua/app/module/collection/collection_manager.lua index 30d6fe30..a69d6e3b 100644 --- a/lua/app/module/collection/collection_manager.lua +++ b/lua/app/module/collection/collection_manager.lua @@ -12,15 +12,27 @@ function CollectionManager:rspHeroPoint(result) end end --- 请求领取英雄图鉴奖励 -function CollectionManager:reqHeroPointReward() - self:sendMessage(ProtoMsgType.FromMsgEnum.HeroCollectionUpgradeReq, {}, {}, self.rspHeroPointReward, BIReport.ITEM_GET_TYPE.COLLECTION_HERO_REWARD) +-- 请求领取皮肤图鉴点数 +function CollectionManager:reqSkinPoint(id) + self:sendMessage(ProtoMsgType.FromMsgEnum.SkinCollectionPointReq, {skin_id = id}, {}, self.rspSkinPoint) 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 GFunc.showRewardBox(result.rewards) - DataManager.CollectionData:onGetedPointRewardSuccess(GConst.CollectionConst.TYPE.HERO) + DataManager.CollectionData:onGetedPointRewardSuccess() end end diff --git a/lua/app/module/equip/equip_const.lua b/lua/app/module/equip/equip_const.lua index 2ca003ed..4cfbdd99 100644 --- a/lua/app/module/equip/equip_const.lua +++ b/lua/app/module/equip/equip_const.lua @@ -9,19 +9,4 @@ EquipConst.PART_TYPE = { 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 \ No newline at end of file diff --git a/lua/app/module/hero/hero_const.lua b/lua/app/module/hero/hero_const.lua index 5005327c..d9d11d88 100644 --- a/lua/app/module/hero/hero_const.lua +++ b/lua/app/module/hero/hero_const.lua @@ -54,15 +54,22 @@ HeroConst.ATTR_SHOW_ARMOR = { HeroConst.ATTR_SHOW_SKIN = { GConst.MATCH_HP_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_BASE, HeroConst.ATTR_SHOW_WEAPON, HeroConst.ATTR_SHOW_ARMOR, + HeroConst.ATTR_SHOW_SKIN, } HeroConst.TRIAL_HERO_ID = 34001 -- 花木兰 diff --git a/lua/app/module/hero/hero_manager.lua b/lua/app/module/hero/hero_manager.lua index fa3cc205..dbb3525d 100644 --- a/lua/app/module/hero/hero_manager.lua +++ b/lua/app/module/hero/hero_manager.lua @@ -38,7 +38,11 @@ end ------------------------------------------ 英雄相关的工具方法 ------------------------------ 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 local color = GConst.BattleConst.ELEMENT_COLOR[self:getHeroMatchType(id)] if color then @@ -49,7 +53,11 @@ function HeroManager:getHeroName(id, needColor) end 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 function HeroManager:getHeroIcon(heroId) diff --git a/lua/app/module/item/item_const.lua b/lua/app/module/item/item_const.lua index 200a9db8..e809c7df 100644 --- a/lua/app/module/item/item_const.lua +++ b/lua/app/module/item/item_const.lua @@ -27,6 +27,7 @@ ItemConst.ITEM_TYPE = { RANDOM_BOX_ITEM = 7, FIXED_BOX_ITEM = 8, EPIC_HERO_FRAMENT = 11, + SKIN = 12 } return ItemConst \ No newline at end of file diff --git a/lua/app/module/skin.meta b/lua/app/module/skin.meta new file mode 100644 index 00000000..6623a59b --- /dev/null +++ b/lua/app/module/skin.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7be6c4d65cb5364d923179989736554 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/module/skin/skin_manager.lua b/lua/app/module/skin/skin_manager.lua new file mode 100644 index 00000000..cb12ce70 --- /dev/null +++ b/lua/app/module/skin/skin_manager.lua @@ -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 \ No newline at end of file diff --git a/lua/app/userdata/collection/collection_hero_entity.lua.meta b/lua/app/module/skin/skin_manager.lua.meta similarity index 86% rename from lua/app/userdata/collection/collection_hero_entity.lua.meta rename to lua/app/module/skin/skin_manager.lua.meta index 28648d2d..ca6054fb 100644 --- a/lua/app/userdata/collection/collection_hero_entity.lua.meta +++ b/lua/app/module/skin/skin_manager.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5f7fd6b82afd7a447a1abafe52103641 +guid: 52b42c16b774c764d97de9262d74ed19 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/proto/proto_msg_type.lua b/lua/app/proto/proto_msg_type.lua index 6d31f073..16694bd4 100644 --- a/lua/app/proto/proto_msg_type.lua +++ b/lua/app/proto/proto_msg_type.lua @@ -41,6 +41,8 @@ local ProtoMsgType = { [850672724] = "SummerBountyClaimByDiamondRsp", [904222760] = "ArenaBountyLevelUnlockReq", [904224593] = "ArenaBountyLevelUnlockRsp", + [965540816] = "CollectionUpgradeReq", + [965542649] = "CollectionUpgradeRsp", [1008447203] = "DeleteReq", [1008449036] = "DeleteRsp", [1067411524] = "BuyTicketReq", @@ -77,8 +79,6 @@ local ProtoMsgType = { [1746319121] = "IdleInfoRsp", [1751460231] = "PVPHeroesArrayReq", [1751462064] = "PVPHeroesArrayRsp", - [1870101082] = "HeroCollectionUpgradeReq", - [1870102915] = "HeroCollectionUpgradeRsp", [1901321540] = "PipedReq", [2060508030] = "ChangeAvatarFrameReq", [2060509863] = "ChangeAvatarFrameRsp", @@ -186,6 +186,8 @@ local ProtoMsgType = { [3763119103] = "HeartbeatRsp", [3805364358] = "EquipUpgradeReq", [3805366191] = "EquipUpgradeRsp", + [3851969243] = "HeroChangeSkinReq", + [3851971076] = "HeroChangeSkinRsp", [3904148760] = "GMReq", [3904150593] = "GMRsp", [3933875617] = "ChapterStartReq", @@ -194,6 +196,8 @@ local ProtoMsgType = { [4106157842] = "BountyLevelUnlockRsp", [4133057746] = "ChapterGoldChallengeFarmReq", [4133059579] = "ChapterGoldChallengeFarmRsp", + [4149362837] = "SkinCollectionPointReq", + [4149364670] = "SkinCollectionPointRsp", [4152754481] = "PVPChallengeStartReq", [4152756314] = "PVPChallengeStartRsp", [4155165814] = "SummerTaskClaimReq", @@ -243,6 +247,8 @@ local ProtoMsgType = { SummerBountyClaimByDiamondRsp = 850672724, ArenaBountyLevelUnlockReq = 904222760, ArenaBountyLevelUnlockRsp = 904224593, + CollectionUpgradeReq = 965540816, + CollectionUpgradeRsp = 965542649, DeleteReq = 1008447203, DeleteRsp = 1008449036, BuyTicketReq = 1067411524, @@ -279,8 +285,6 @@ local ProtoMsgType = { IdleInfoRsp = 1746319121, PVPHeroesArrayReq = 1751460231, PVPHeroesArrayRsp = 1751462064, - HeroCollectionUpgradeReq = 1870101082, - HeroCollectionUpgradeRsp = 1870102915, PipedReq = 1901321540, ChangeAvatarFrameReq = 2060508030, ChangeAvatarFrameRsp = 2060509863, @@ -388,6 +392,8 @@ local ProtoMsgType = { HeartbeatRsp = 3763119103, EquipUpgradeReq = 3805364358, EquipUpgradeRsp = 3805366191, + HeroChangeSkinReq = 3851969243, + HeroChangeSkinRsp = 3851971076, GMReq = 3904148760, GMRsp = 3904150593, ChapterStartReq = 3933875617, @@ -396,6 +402,8 @@ local ProtoMsgType = { BountyLevelUnlockRsp = 4106157842, ChapterGoldChallengeFarmReq = 4133057746, ChapterGoldChallengeFarmRsp = 4133059579, + SkinCollectionPointReq = 4149362837, + SkinCollectionPointRsp = 4149364670, PVPChallengeStartReq = 4152754481, PVPChallengeStartRsp = 4152756314, SummerTaskClaimReq = 4155165814, @@ -445,6 +453,8 @@ local ProtoMsgType = { SummerBountyClaimByDiamondRsp = "SummerBountyClaimByDiamondRsp", ArenaBountyLevelUnlockReq = "ArenaBountyLevelUnlockReq", ArenaBountyLevelUnlockRsp = "ArenaBountyLevelUnlockRsp", + CollectionUpgradeReq = "CollectionUpgradeReq", + CollectionUpgradeRsp = "CollectionUpgradeRsp", DeleteReq = "DeleteReq", DeleteRsp = "DeleteRsp", BuyTicketReq = "BuyTicketReq", @@ -481,8 +491,6 @@ local ProtoMsgType = { IdleInfoRsp = "IdleInfoRsp", PVPHeroesArrayReq = "PVPHeroesArrayReq", PVPHeroesArrayRsp = "PVPHeroesArrayRsp", - HeroCollectionUpgradeReq = "HeroCollectionUpgradeReq", - HeroCollectionUpgradeRsp = "HeroCollectionUpgradeRsp", PipedReq = "PipedReq", ChangeAvatarFrameReq = "ChangeAvatarFrameReq", ChangeAvatarFrameRsp = "ChangeAvatarFrameRsp", @@ -590,6 +598,8 @@ local ProtoMsgType = { HeartbeatRsp = "HeartbeatRsp", EquipUpgradeReq = "EquipUpgradeReq", EquipUpgradeRsp = "EquipUpgradeRsp", + HeroChangeSkinReq = "HeroChangeSkinReq", + HeroChangeSkinRsp = "HeroChangeSkinRsp", GMReq = "GMReq", GMRsp = "GMRsp", ChapterStartReq = "ChapterStartReq", @@ -598,6 +608,8 @@ local ProtoMsgType = { BountyLevelUnlockRsp = "BountyLevelUnlockRsp", ChapterGoldChallengeFarmReq = "ChapterGoldChallengeFarmReq", ChapterGoldChallengeFarmRsp = "ChapterGoldChallengeFarmRsp", + SkinCollectionPointReq = "SkinCollectionPointReq", + SkinCollectionPointRsp = "SkinCollectionPointRsp", PVPChallengeStartReq = "PVPChallengeStartReq", PVPChallengeStartRsp = "PVPChallengeStartRsp", SummerTaskClaimReq = "SummerTaskClaimReq", diff --git a/lua/app/ui/collection/cell/collection_cell.lua b/lua/app/ui/collection/cell/collection_cell.lua new file mode 100644 index 00000000..14e367bb --- /dev/null +++ b/lua/app/ui/collection/cell/collection_cell.lua @@ -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(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()).."") + 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 \ No newline at end of file diff --git a/lua/app/ui/collection/cell/collection_hero_cell.lua.meta b/lua/app/ui/collection/cell/collection_cell.lua.meta similarity index 86% rename from lua/app/ui/collection/cell/collection_hero_cell.lua.meta rename to lua/app/ui/collection/cell/collection_cell.lua.meta index 9524831e..0fa0ee72 100644 --- a/lua/app/ui/collection/cell/collection_hero_cell.lua.meta +++ b/lua/app/ui/collection/cell/collection_cell.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ae283986db9430a4c93e36cf10c35276 +guid: 718e6942d66e6af45b581dc3b26f7687 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/collection/cell/collection_hero_cell.lua b/lua/app/ui/collection/cell/collection_hero_cell.lua deleted file mode 100644 index b4c2871b..00000000 --- a/lua/app/ui/collection/cell/collection_hero_cell.lua +++ /dev/null @@ -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(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_1, heroEntity:getLv()).."") - 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 \ No newline at end of file diff --git a/lua/app/ui/collection/cell/collection_reward_cell.lua b/lua/app/ui/collection/cell/collection_reward_cell.lua index 6bc5fe94..a08403b7 100644 --- a/lua/app/ui/collection/cell/collection_reward_cell.lua +++ b/lua/app/ui/collection/cell/collection_reward_cell.lua @@ -17,20 +17,20 @@ function CollectionRewardCell:init() end function CollectionRewardCell:refresh(collectionType, id) - local curPoint = DataManager.CollectionData:getCurCollectPoint(collectionType) - local rewardList = DataManager.CollectionData:getRewardList(collectionType)[id] + local curPoint = DataManager.CollectionData:getCurCollectPoint() + local rewardList = DataManager.CollectionData:getRewardList()[id] self.txValue:setText(rewardList.point) self.txTag:setText(curPoint) - local prog = DataManager.CollectionData:getRewardTargetProgress(collectionType, id) - if DataManager.CollectionData:getCurTargetId(collectionType) == id then + local prog = DataManager.CollectionData:getRewardTargetProgress(id) + if DataManager.CollectionData:getCurTargetId() == id then self.imgProg.value = prog self.tagProg:setVisible(true) -- 高度超框处理 local rootHeight = self.baseObject:fastGetSizeDeltaY() 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() if posY < tagHeight / 2 then posY = tagHeight / 2 @@ -42,7 +42,7 @@ function CollectionRewardCell:refresh(collectionType, id) self.tagProg:setVisible(false) end - if DataManager.CollectionData:isRewardReceived(collectionType, id) then + if DataManager.CollectionData:isRewardReceived(id) then self.maskReward:setVisible(false) self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_5)) else diff --git a/lua/app/ui/collection/collection_reward_ui.lua b/lua/app/ui/collection/collection_reward_ui.lua index 9f4525ae..45b757a3 100644 --- a/lua/app/ui/collection/collection_reward_ui.lua +++ b/lua/app/ui/collection/collection_reward_ui.lua @@ -39,7 +39,7 @@ function CollectionRewardUI:onLoadRootComplete() end function CollectionRewardUI:onRefresh() - local datas = DataManager.CollectionData:getRewardList(self.collectType) + local datas = DataManager.CollectionData:getRewardList() self.scrollrectComp:addInitCallback(function() return "app/ui/collection/cell/collection_reward_cell" end) @@ -48,7 +48,7 @@ function CollectionRewardUI:onRefresh() end) self.scrollrectComp:clearCells() self.scrollrectComp:refillCells(#datas) - local selectIdx = DataManager.CollectionData:getCurTargetId(self.collectType) + local selectIdx = DataManager.CollectionData:getCurTargetId() if selectIdx - 2 >= 0 then selectIdx = selectIdx - 2 end diff --git a/lua/app/ui/collection/collection_ui.lua b/lua/app/ui/collection/collection_ui.lua index 54c88da5..e54284ac 100644 --- a/lua/app/ui/collection/collection_ui.lua +++ b/lua/app/ui/collection/collection_ui.lua @@ -53,14 +53,29 @@ function CollectionUI:onLoadRootComplete() self.imgProg = uiMap["collect_ui.rewards.prog.img_prog"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER) self.btnRewards = uiMap["collection_ui.rewards.point"] 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() UIManager:showUI("app/ui/collection/collection_reward_ui", self.collectType) end) self.btnGet:addClickListener(function() - ModuleManager.CollectionManager:reqHeroPointReward() + ModuleManager.CollectionManager:reqPointReward() end) self.btnClose:addClickListener(function() self:closeUI() @@ -73,7 +88,13 @@ function CollectionUI:onLoadRootComplete() } ModuleManager.TipsManager:showHelpTips(params) 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:showFlyAnim() end) @@ -83,33 +104,32 @@ function CollectionUI:onLoadRootComplete() end 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:refreshCollectPoint() end function CollectionUI:showCollectList() - local datas = 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.collectList = DataManager.CollectionData:getCollectList(self.collectType) self.scrollrectComp:clearCells() - self.scrollrectComp:refillCells(#datas) + self.scrollrectComp:refillCells(#self.collectList) self.flyIcon:setActive(false) end -- 刷新收集点数状态 function CollectionUI:refreshCollectPoint() - local showId = DataManager.CollectionData:getCanGetOrCollectingTargetId(self.collectType) + local showId = DataManager.CollectionData:getCanGetOrCollectingTargetId() -- Logger.logHighlight("展示档位："..showId) if showId then - local target = DataManager.CollectionData:getTargetPoint(self.collectType, showId) - local owned = DataManager.CollectionData:getTargetOwnedPoint(self.collectType, showId) + local target = DataManager.CollectionData:getTargetPoint(showId) + local owned = DataManager.CollectionData:getTargetOwnedPoint(showId) self.txStage:setText(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.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.COLLECTION_DESC_9)) @@ -132,8 +152,8 @@ function CollectionUI:refreshCollectPoint() self.btnGet:setTouchEnable(false) end - local total = DataManager.CollectionData:getTotalCollectPoint(self.collectType) - local cur = DataManager.CollectionData:getCurCollectPoint(self.collectType) + local total = DataManager.CollectionData:getTotalCollectPoint() + local cur = DataManager.CollectionData:getCurCollectPoint() self.txTotalValue:setText(cur.."/"..total) GFunc.centerImgAndTx(self.imgGet, self.txGet, 5) @@ -162,4 +182,24 @@ function CollectionUI:showFlyAnim() 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 \ No newline at end of file diff --git a/lua/app/ui/common/cell/reward_cell.lua b/lua/app/ui/common/cell/reward_cell.lua index e289591a..e76e59db 100644 --- a/lua/app/ui/common/cell/reward_cell.lua +++ b/lua/app/ui/common/cell/reward_cell.lua @@ -12,8 +12,13 @@ function RewardCell:init() self.sImg = uiMap["reward_cell.item_bg.s"] self.matchImg = uiMap["reward_cell.item_bg.match_img"] self.frameAni = uiMap["reward_cell.frame_ani"] + -- 首通 self.firstPass = uiMap["reward_cell.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.baseObject:addClickListener(function() if self.clickCallback then @@ -99,6 +104,7 @@ function RewardCell:_refreshItem(info, count) self.sImg:setVisible(false) self.matchImg:setVisible(false) end + self:showSkin(info.type == GConst.ItemConst.ITEM_TYPE.SKIN) end function RewardCell:setNumTx(str) @@ -161,6 +167,7 @@ function RewardCell:showRightUpIcon(show, atlas, iconName) self.rightUpIcon:setSprite(atlas, iconName) end +-- 展示首通标记 function RewardCell:showFirstPass(show) self.firstPass:setVisible(show == true) if show then @@ -168,4 +175,15 @@ function RewardCell:showFirstPass(show) 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 \ No newline at end of file diff --git a/lua/app/ui/hero/armor_info_comp.lua b/lua/app/ui/hero/armor_info_comp.lua index 56afb3c9..7451e382 100644 --- a/lua/app/ui/hero/armor_info_comp.lua +++ b/lua/app/ui/hero/armor_info_comp.lua @@ -123,8 +123,8 @@ function ArmorInfoComp:refreshSelectArmor() local txNum = map["tx_num"] obj:setVisible(true) - if not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) and (curAtk > 0 or diffBaseAtk > 0) then - table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) + if not table.containValue(showAttrType, GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()]) and (curAtk > 0 or diffBaseAtk > 0) then + table.insert(showAttrType, GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3).."") local numStr = curAtk // DEFAULT_FACTOR @@ -132,8 +132,8 @@ function ArmorInfoComp:refreshSelectArmor() numStr = numStr .. "+" .. diffBaseAtk .. "" end txNum:setText(numStr) - elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) and (curNormalHurt > 0 or diffBaseNormalHurt > 0) then - table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) + elseif not table.containValue(showAttrType, GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()]) and (curNormalHurt > 0 or diffBaseNormalHurt > 0) then + table.insert(showAttrType, GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT).."") local numStr = curNormalHurt // DEFAULT_FACTOR @@ -141,8 +141,8 @@ function ArmorInfoComp:refreshSelectArmor() numStr = numStr .. "+" .. diffBaseNormalHurt .. "" end txNum:setText(numStr) - elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) and (curSkillHurt > 0 or diffBaseSkillHurt > 0) then - table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) + elseif not table.containValue(showAttrType, GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()]) and (curSkillHurt > 0 or diffBaseSkillHurt > 0) then + table.insert(showAttrType, GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT).."") local numStr = curSkillHurt // DEFAULT_FACTOR @@ -150,8 +150,8 @@ function ArmorInfoComp:refreshSelectArmor() numStr = numStr .. "+" .. diffBaseSkillHurt .. "" end txNum:setText(numStr) - elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) and (curHp > 0 or diffBaseHp > 0) then - table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) + elseif not table.containValue(showAttrType, GConst.MATCH_HP_NAME[self.heroEntity:getMatchType()]) and (curHp > 0 or diffBaseHp > 0) then + table.insert(showAttrType, GConst.MATCH_HP_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2).."") local numStr = curHp // DEFAULT_FACTOR diff --git a/lua/app/ui/hero/cell/attr_cell.lua b/lua/app/ui/hero/cell/attr_cell.lua index ab441cde..7dcc893d 100644 --- a/lua/app/ui/hero/cell/attr_cell.lua +++ b/lua/app/ui/hero/cell/attr_cell.lua @@ -12,12 +12,6 @@ end function AttrCell:refresh(heroEntity, nodeType, attrType) 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.attrName = attrType[self.heroEntity:getMatchType()] @@ -61,13 +55,14 @@ function AttrCell:showHp() value = self.heroEntity:getCfgHp(self.heroEntity:getBeginLv()) end 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 - value = value + self.hatEntity:getHp() - value = value + self.clothesEntity:getHp() - value = value + self.beltEntity:getHp() - value = value + self.handguardEntity:getHp() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getHp() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getHp() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getHp() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getHp() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then + value = value + DataManager.SkinData:getHp(self.heroEntity:getCfgId()) end self.txValue:setText(value // DEFAULT_FACTOR) @@ -92,13 +87,14 @@ function AttrCell:showAtk() value = self.heroEntity:getCfgAtk(self.heroEntity:getBeginLv()) end 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 - value = value + self.hatEntity:getAttack() - value = value + self.clothesEntity:getAttack() - value = value + self.beltEntity:getAttack() - value = value + self.handguardEntity:getAttack() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getAttack() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getAttack() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getAttack() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getAttack() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then + value = value + DataManager.SkinData:getAttack(self.heroEntity:getCfgId()) end 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_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then - value = value + self.hatEntity:getNormalHurt() - value = value + self.clothesEntity:getNormalHurt() - value = value + self.beltEntity:getNormalHurt() - value = value + self.handguardEntity:getNormalHurt() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getNormalHurt() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getNormalHurt() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getNormalHurt() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getNormalHurt() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then + value = value + DataManager.SkinData:getNormalHurt(self.heroEntity:getCfgId()) end 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_WEAPON then elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_ARMOR then - value = value + self.hatEntity:getSkillHurt() - value = value + self.clothesEntity:getSkillHurt() - value = value + self.beltEntity:getSkillHurt() - value = value + self.handguardEntity:getSkillHurt() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getSkillHurt() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getSkillHurt() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getSkillHurt() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getSkillHurt() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then + value = value + DataManager.SkinData:getSkillHurt(self.heroEntity:getCfgId()) end self.txValue:setText(value // DEFAULT_FACTOR) @@ -156,9 +154,10 @@ function AttrCell:showCrit() value = self.heroEntity:getTotalAttrValue(self.attrName) elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE 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_SKIN then + value = value + DataManager.SkinData:getCritPercent(self.heroEntity:getCfgId()) end self.txValue:setText(value // PERCENT_FACTOR .. "%") @@ -174,9 +173,10 @@ function AttrCell:showCritAtk() value = self.heroEntity:getTotalAttrValue(self.attrName) elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE 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_SKIN then + value = value + DataManager.SkinData:getCritHurtPercent(self.heroEntity:getCfgId()) end 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_ARMOR then -- 套装属性，防具只用计算一次 - value = value + self.hatEntity:getNormalHurtPercent() - -- value = value + self.clothesEntity:getNormalHurtPercent() - -- value = value + self.beltEntity:getNormalHurtPercent() - -- value = value + self.handguardEntity:getNormalHurtPercent() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getNormalHurtPercent() + -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getNormalHurtPercent() + -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getNormalHurtPercent() + -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getNormalHurtPercent() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then + value = value + DataManager.SkinData:getNormalHurtPercent(self.heroEntity:getCfgId()) end 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_ARMOR then -- 套装属性，防具只用计算一次 - value = value + self.hatEntity:getSkillHurtPercent() - -- value = value + self.clothesEntity:getSkillHurtPercent() - -- value = value + self.beltEntity:getSkillHurtPercent() - -- value = value + self.handguardEntity:getSkillHurtPercent() + value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HAT):getSkillHurtPercent() + -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.CLOTHES):getSkillHurtPercent() + -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.BELT):getSkillHurtPercent() + -- value = value + self.heroEntity:getEquips(GConst.EquipConst.PART_TYPE.HANDGUARD):getSkillHurtPercent() elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_SKIN then + value = value + DataManager.SkinData:getSkillHurtPercent(self.heroEntity:getCfgId()) end self.txValue:setText(value // PERCENT_FACTOR .. "%") @@ -236,9 +238,10 @@ function AttrCell:showCured() value = self.heroEntity:getTotalAttrValue(self.attrName) elseif self.nodeType == GConst.HeroConst.ATTR_SHOW_BASE 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_SKIN then + value = value + DataManager.SkinData:getHealPercent(self.heroEntity:getCfgId()) end self.txValue:setText(value // PERCENT_FACTOR .. "%") diff --git a/lua/app/ui/hero/cell/attr_node_cell.lua b/lua/app/ui/hero/cell/attr_node_cell.lua index 929fb0f1..26975c68 100644 --- a/lua/app/ui/hero/cell/attr_node_cell.lua +++ b/lua/app/ui/hero/cell/attr_node_cell.lua @@ -22,11 +22,20 @@ function AttrNodeCell:refresh(heroEntity, node) self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_17)) end + self.attrCount = 0 for index, attr in ipairs(node) do - CellManager:loadCellAsync(ATTR_CELL_PATH, ATTR_CELL, self.itemsRoot, function(cell) - cell:refresh(heroEntity, node, attr) - end) + if node ~= GConst.HeroConst.ATTR_SHOW_SKIN or DataManager.SkinData:hasAttr(heroEntity:getCfgId(), attr[heroEntity:getMatchType()]) then + self.attrCount = self.attrCount + 1 + CellManager:loadCellAsync(ATTR_CELL_PATH, ATTR_CELL, self.itemsRoot, function(cell) + cell:refresh(heroEntity, node, attr) + end) + end end end +--获取节点显示属性个数 +function AttrNodeCell:getShowAttrCount() + return self.attrCount +end + return AttrNodeCell \ No newline at end of file diff --git a/lua/app/ui/hero/cell/skin_cell.lua b/lua/app/ui/hero/cell/skin_cell.lua new file mode 100644 index 00000000..236c39ab --- /dev/null +++ b/lua/app/ui/hero/cell/skin_cell.lua @@ -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 \ No newline at end of file diff --git a/lua/app/userdata/collection/collection_base_entity.lua.meta b/lua/app/ui/hero/cell/skin_cell.lua.meta similarity index 86% rename from lua/app/userdata/collection/collection_base_entity.lua.meta rename to lua/app/ui/hero/cell/skin_cell.lua.meta index 30bccb43..ebb825ff 100644 --- a/lua/app/userdata/collection/collection_base_entity.lua.meta +++ b/lua/app/ui/hero/cell/skin_cell.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b390f1e69773bbc4b8a6c84deb1fe030 +guid: f9f8a5d8d516dd643baf7a10d7b45da0 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/ui/hero/hero_attr_ui.lua b/lua/app/ui/hero/hero_attr_ui.lua index 37b9e168..56b65058 100644 --- a/lua/app/ui/hero/hero_attr_ui.lua +++ b/lua/app/ui/hero/hero_attr_ui.lua @@ -43,15 +43,21 @@ end function HeroAttrUI:onRefresh() local totalHeight = 0 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 - cell.baseObject:setLocalPositionY(-totalHeight) - cell.baseObject:setSizeDeltaY(nodeHeight) - cell:refresh(self.heroEntity, node) - totalHeight = totalHeight + nodeHeight - self.rootNodes:setSizeDeltaY(totalHeight) - end) + -- 有皮肤属性时才显示皮肤 + if node ~= GConst.HeroConst.ATTR_SHOW_SKIN or #DataManager.SkinData:getOwnAllAttr(self.heroEntity:getCfgId()) > 0 then + CellManager:loadCellAsync(ATTR_NODE_CELL_PATH, ATTR_NODE_CELL, self.rootNodes, function(cell) + cell:refresh(self.heroEntity, node) + + local attrCount = cell:getShowAttrCount() + local nodeHeight = math.ceil(attrCount / 2) * ATTR_CELL_HEIGHT + (math.ceil(attrCount / 2) - 1) * ATTR_CELL_SPACING_Y + ATTR_CELLS_PADDING + cell.baseObject:setLocalPositionY(-totalHeight) + cell.baseObject:setSizeDeltaY(nodeHeight) + totalHeight = totalHeight + nodeHeight + self.rootNodes:setSizeDeltaY(totalHeight) + end) + end end + self.rootNodes:setAnchoredPositionY(0) end return HeroAttrUI \ No newline at end of file diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index 4e9e8c39..9264a3ea 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/lua/app/ui/hero/hero_comp.lua @@ -67,7 +67,7 @@ function HeroComp:init() end end - self:bind(DataManager.CollectionData, "dirtyHero", function() + self:bind(DataManager.CollectionData, "isDirty", function() self:refreshCollectEntrance() end) self:bind(DataManager.HeroData, "isDirty", function() @@ -287,8 +287,8 @@ end -- 刷新图鉴入口 function HeroComp:refreshCollectEntrance() if self.battleType == GConst.BattleConst.FORMATION_TYPE.STAGE then - self.btnCollection:setVisible(DataManager.CollectionData:isOpen(GConst.CollectionConst.TYPE.HERO)) - if DataManager.CollectionData:hasRedPoint(GConst.CollectionConst.TYPE.HERO) then + self.btnCollection:setVisible(DataManager.CollectionData:isOpen()) + if DataManager.CollectionData:hasRedPoint() then self.btnCollection:addRedPoint(25, 30, 0.6) else self.btnCollection:removeRedPoint() diff --git a/lua/app/ui/hero/hero_detail_ui.lua b/lua/app/ui/hero/hero_detail_ui.lua index d5f19933..d72bd28c 100644 --- a/lua/app/ui/hero/hero_detail_ui.lua +++ b/lua/app/ui/hero/hero_detail_ui.lua @@ -2,9 +2,18 @@ local HeroDetailUI = class("HeroDetailUI", BaseUI) local COMP_HERO = "app/ui/hero/hero_info_comp" local COMP_WEAPON = "app/ui/hero/weapon_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_LOOK = 802 +-- 界面类型 +local PANEL_TYPE = { + HERO = 1, + WEAPON = 2, + ARMOR = 3, + SKIN = 4, +} + function HeroDetailUI:isFullScreen() return false end @@ -18,7 +27,7 @@ function HeroDetailUI:onPressBackspace() end 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 if parmas.heroEntity then self.heroEntity = parmas.heroEntity @@ -35,6 +44,7 @@ function HeroDetailUI:onLoadRootComplete() self.heroInfo = uiMap["hero_detail_ui.hero_info"] self.weaponInfo = uiMap["hero_detail_ui.weapon_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.btnClose = uiMap["hero_detail_ui.common.btn_close"] 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.selectArmor = uiMap["hero_detail_ui.common.btns.btn_armor.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.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.txArmor1: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 self.lockWeapon:setVisible(true) GFunc.centerImgAndTx(self.lockWeapon, self.txWeapon1, 5) @@ -72,27 +89,40 @@ function HeroDetailUI:onLoadRootComplete() else self.lockArmor:setVisible(false) 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:updateSide() self:refreshShow() self.btnHero:addClickListener(function() - self.panelType = GConst.EquipConst.PANEL_TYPE.HERO + self.panelType = PANEL_TYPE.HERO self:refreshShow() end) self.btnWeapon:addClickListener(function() if not DataManager.EquipData:isWeaponOpen(true) then return end - self.panelType = GConst.EquipConst.PANEL_TYPE.WEAPON + self.panelType = PANEL_TYPE.WEAPON self:refreshShow() end) self.btnArmor:addClickListener(function() if not DataManager.EquipData:isArmorOpen(true) then return 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() end) self.btnClose:addClickListener(function() @@ -139,6 +169,9 @@ function HeroDetailUI:onLoadRootComplete() self:addEventListener(EventManager.CUSTOM_EVENT.GO_DUNGEON_UI, function() self:closeUI() end) + self:addEventListener(EventManager.CUSTOM_EVENT.SKIN_SELECT, function(skinId) + self.compSkin:refreshSelectSkin(skinId) + end) end function HeroDetailUI:updateSide() @@ -152,18 +185,20 @@ end function HeroDetailUI:refreshShow() self.txTitle:setText(self.heroEntity:getName()) - - if self.panelType == GConst.EquipConst.PANEL_TYPE.HERO then + if self.panelType == PANEL_TYPE.HERO then self:showHeroInfo() - elseif self.panelType == GConst.EquipConst.PANEL_TYPE.WEAPON then + elseif self.panelType == PANEL_TYPE.WEAPON then self:showWeaponInfo() - elseif self.panelType == GConst.EquipConst.PANEL_TYPE.ARMOR then + elseif self.panelType == PANEL_TYPE.ARMOR then self:showArmorInfo() + elseif self.panelType == PANEL_TYPE.SKIN then + self:showSkinInfo() end if self.onlyLook then -- 仅查看的不显示升级和激活按钮 self.btnHero:setActive(false) self.btnWeapon:setActive(false) self.btnArmor:setActive(false) + self.btnSkin:setActive(false) self.btnLeft:setActive(false) self.btnRight:setActive(false) self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_LOOK) @@ -171,6 +206,7 @@ function HeroDetailUI:refreshShow() self.btnHero:setActive(true) self.btnWeapon:setActive(true) self.btnArmor:setActive(true) + self.btnSkin:setActive(true) self.btnLeft:setActive(self:isExistLeftHero()) self.btnRight:setActive(self:isExistRightHero()) self.commonInfo:setSizeDeltaY(SIZE_DELTA_Y_HERO) @@ -181,17 +217,17 @@ end -- 刷新标签红点 function HeroDetailUI:refreshRedPoint() if self.heroEntity:canLvUp() then - self.btnHero:addRedPoint(-70, 0, 0.6) + self.btnHero:addRedPoint(-55, 0, 0.6) else self.btnHero:removeRedPoint() end if DataManager.EquipData:canUpgradeWeapon(self.heroEntity:getCfgId()) then - self.btnWeapon:addRedPoint(-70, 0, 0.6) + self.btnWeapon:addRedPoint(-55, 0, 0.6) else self.btnWeapon:removeRedPoint() end if DataManager.EquipData:canUpgradeArmor(self.heroEntity:getCfgId()) then - self.btnArmor:addRedPoint(-70, 0, 0.6) + self.btnArmor:addRedPoint(-55, 0, 0.6) else self.btnArmor:removeRedPoint() end @@ -204,6 +240,8 @@ function HeroDetailUI:showHeroInfo() self.selectWeapon:setActive(false) self.armorInfo:setActive(false) self.selectArmor:setActive(false) + self.skinInfo:setActive(false) + self.selectSkin:setActive(false) if not self.compHero then self.heroInfo:initPrefabHelper() @@ -222,6 +260,8 @@ function HeroDetailUI:showWeaponInfo() self.selectWeapon:setActive(true) self.armorInfo:setActive(false) self.selectArmor:setActive(false) + self.skinInfo:setActive(false) + self.selectSkin:setActive(false) if not self.compWeapon then self.weaponInfo:initPrefabHelper() @@ -241,6 +281,8 @@ function HeroDetailUI:showArmorInfo() self.selectWeapon:setActive(false) self.armorInfo:setActive(true) self.selectArmor:setActive(true) + self.skinInfo:setActive(false) + self.selectSkin:setActive(false) if not self.compArmor then self.armorInfo:initPrefabHelper() @@ -253,6 +295,27 @@ function HeroDetailUI:showArmorInfo() self.compArmor:refresh() 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() return self.idxLast and self.idxLast > 0 diff --git a/lua/app/ui/hero/skin_info_comp.lua b/lua/app/ui/hero/skin_info_comp.lua new file mode 100644 index 00000000..adc4c4e0 --- /dev/null +++ b/lua/app/ui/hero/skin_info_comp.lua @@ -0,0 +1,206 @@ +local SkinInfoComp = class("SkinInfoComp", LuaComponent) +local DEFAULT_FACTOR = GConst.BattleConst.DEFAULT_FACTOR +local PERCENT_FACTOR = 100 + + +function SkinInfoComp:init() + local uiMap = self:getUIMap() + + self.txName = uiMap["skin_info.name.tx_name"] + self.bgQlt = uiMap["skin_info.bg_qlt"] + self.iconQlt = uiMap["skin_info.bg_qlt.icon_qlt"] + self.txQlt = uiMap["skin_info.bg_qlt.tx_qlt"] + -- self.spineRoot = uiMap["skin_info.spine_root"] + self.spineSkin = uiMap["skin_info.spine_skin"] + self.txDesc1 = uiMap["skin_info.tx_desc_1"] + self.txDesc2 = uiMap["skin_info.tx_desc_2"] + self.scrollrectComp = uiMap["skin_info.scrollrect"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE) + self.btnUse = uiMap["skin_info.bottom.btn_use"] + self.txBtn = uiMap["skin_info.bottom.btn_use.tx_desc"] + self.txSource = uiMap["skin_info.bottom.tx_desc"] + self.btnAttr = uiMap["skin_info.attr_2.btn_attr"] + self.attr = {} + for i = 1, 2 do + self.attr[i] = uiMap["skin_info.attr_" .. i] + end + + self.txDesc1:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN_ATTR)) + self.txDesc2:setText(I18N:getGlobalText(I18N.GlobalConst.SKIN_LIST)) + + self.btnUse:addClickListener(function() + ModuleManager.SkinManager:reqChangeSkin(self.heroEntity:getCfgId(), self.selectSkinId) + end) + self.btnAttr:addClickListener(function() + UIManager:showUI("app/ui/hero/hero_attr_ui", {heroEntity = self.heroEntity}) + end) +end + +function SkinInfoComp:setUI(ui) + self.uiRoot = ui +end + +function SkinInfoComp:setHeroData(heroEntity) + self.heroEntity = heroEntity + self.selectSkinId = self.heroEntity:getSkinId() + self:bind(self.heroEntity, "isDirty", function() + self:refresh() + end) +end + +function SkinInfoComp:refresh() + local ids = DataManager.SkinData:getHeroAllSkinIdsSort(self.heroEntity:getCfgId()) + self.scrollrectComp:addInitCallback(function() + return "app/ui/hero/cell/skin_cell" + end) + self.scrollrectComp:addRefreshCallback(function(index, cell) + cell:refresh(ids[index].id, ids[index].id == self.selectSkinId) + end) + self.scrollrectComp:clearCells() + self.scrollrectComp:refillCells(#ids) + + self:refreshSelectSkin() +end + +-- 刷新选择皮肤相关内容 +function SkinInfoComp:refreshSelectSkin(selectId) + if selectId then + self.selectSkinId = selectId + self.scrollrectComp:updateAllCell() + end + + local qlt = DataManager.SkinData:getSkinCfg(self.selectSkinId).qlt + self.bgQlt:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_bg_" .. qlt) + self.iconQlt:setSprite(GConst.ATLAS_PATH.HERO, "hero_skin_" .. qlt) + self.txQlt:setText("" .. I18N:getGlobalText("QLT_DESC_" .. qlt) .. "") + self.txName:setText(DataManager.SkinData:getName(self.selectSkinId)) + + -- 属性 + local showAttr = false + local curAttr = DataManager.SkinData:getAttr(self.selectSkinId) + local showAttrType = {} + for index, obj in ipairs(self.attr) do + if curAttr and curAttr[index] then + showAttr = true + obj:setVisible(true) + local map = obj:genAllChildren() + local imgIcon = map["img_icon"] + local txTitle = map["tx_title"] + local txNum = map["tx_num"] + + local showValue + if curAttr[index].type == GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()] then + -- 攻击 + table.insert(showAttrType, GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3).."") + showValue = curAttr[index].num // DEFAULT_FACTOR + elseif curAttr[index].type == GConst.MATCH_ATTACK_ADD_NAME[self.heroEntity:getMatchType()] then + -- 攻击加成百分比 + table.insert(showAttrType, GConst.MATCH_ATTACK_ADD_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3).."") + showValue = curAttr[index].num // PERCENT_FACTOR .. "%" + elseif curAttr[index].type == GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()] then + -- 普攻增伤 + table.insert(showAttrType, GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT).."") + showValue = curAttr[index].num // DEFAULT_FACTOR + elseif curAttr[index].type == GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()] then + -- 技能增伤 + table.insert(showAttrType, GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT).."") + showValue = curAttr[index].num // DEFAULT_FACTOR + elseif curAttr[index].type == GConst.MATCH_NORMAL_HURTP_NAME[self.heroEntity:getMatchType()] then + -- 普攻增伤百分比 + table.insert(showAttrType, GConst.MATCH_NORMAL_HURTP_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURTP).."") + showValue = curAttr[index].num // PERCENT_FACTOR .. "%" + elseif curAttr[index].type == GConst.MATCH_SKILL_HURTP_NAME[self.heroEntity:getMatchType()] then + -- 技能增伤百分比 + table.insert(showAttrType, GConst.MATCH_SKILL_HURTP_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURTP).."") + showValue = curAttr[index].num // PERCENT_FACTOR .. "%" + elseif curAttr[index].type == GConst.MATCH_CRIT_NAME[self.heroEntity:getMatchType()] then + -- 暴击率百分比 + table.insert(showAttrType, GConst.MATCH_CRIT_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_22") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_CRIT).."") + showValue = curAttr[index].num // PERCENT_FACTOR .. "%" + elseif curAttr[index].type == GConst.MATCH_CRIT_TIME_NAME[self.heroEntity:getMatchType()] then + -- 暴击伤害百分比 + table.insert(showAttrType, GConst.MATCH_CRIT_TIME_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_23") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_CRIT_TIME).."") + showValue = curAttr[index].num // PERCENT_FACTOR .. "%" + elseif curAttr[index].type == GConst.MATCH_CURED_NAME[self.heroEntity:getMatchType()] then + -- 治疗提升百分比 + table.insert(showAttrType, GConst.MATCH_CURED_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_24") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_CURED).."") + showValue = curAttr[index].num // PERCENT_FACTOR .. "%" + elseif curAttr[index].type == GConst.MATCH_HP_NAME[self.heroEntity:getMatchType()] then + -- 生命 + table.insert(showAttrType, GConst.MATCH_HP_NAME[self.heroEntity:getMatchType()]) + imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4") + txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2).."") + showValue = curAttr[index].num // DEFAULT_FACTOR + else + obj:setVisible(false) + end + txNum:setText(showValue) + else + obj:setVisible(false) + end + end + if showAttr then + self.txDesc1:setActive(true) + self.txDesc2:setAnchoredPositionY(-561) + self.scrollrectComp.baseObject:setAnchoredPositionY(-601) + self.scrollrectComp.baseObject:setSizeDeltaY(170) + else + self.txDesc1:setActive(false) + self.txDesc2:setAnchoredPositionY(-411) + self.scrollrectComp.baseObject:setAnchoredPositionY(-441) + self.scrollrectComp.baseObject:setSizeDeltaY(330) + end + + self.spineSkin:getSkeletonGraphic().enabled = false + self.spineSkin:loadAssetAsync(DataManager.SkinData:getModelId(self.selectSkinId), function() + self.spineSkin:getSkeletonGraphic().enabled = true + self.spineSkin:playAnim("idle", true, true, true) + end, true) + + self.btnUse:setTouchEnable(true) + if self.heroEntity:isUnlock() and DataManager.SkinData:isUnlock(self.selectSkinId) then + -- 已解锁 + self.btnUse:setActive(true) + self.txSource:setActive(false) + if DataManager.SkinData:isActived(self.selectSkinId) then + -- 已穿戴 + self.btnUse:setTouchEnable(false) + self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_grey_1") + self.txBtn:setText(I18N:getGlobalText(I18N.GlobalConst.ON_USING_DESC)) + else + -- 未穿戴 + self.btnUse:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_green_1") + self.txBtn:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_8)) + end + else + -- 未解锁 + self.btnUse:setActive(false) + self.txSource:setActive(true) + if self.heroEntity:isUnlock() then + -- 未解锁皮肤 + self.txSource:setText(DataManager.SkinData:getSource(self.selectSkinId)) + else + -- 未解锁英雄 + self.txSource:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_LOCKED)) + end + end +end + +return SkinInfoComp \ No newline at end of file diff --git a/lua/app/ui/hero/skin_info_comp.lua.meta b/lua/app/ui/hero/skin_info_comp.lua.meta new file mode 100644 index 00000000..2dae3444 --- /dev/null +++ b/lua/app/ui/hero/skin_info_comp.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7209380a6f275fe4fa7fd87e464fde53 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/hero/weapon_info_comp.lua b/lua/app/ui/hero/weapon_info_comp.lua index a4840a3e..8c66470d 100644 --- a/lua/app/ui/hero/weapon_info_comp.lua +++ b/lua/app/ui/hero/weapon_info_comp.lua @@ -87,8 +87,8 @@ function WeaponInfoComp:refresh() local txNum = map["tx_num"] obj:setVisible(true) - if not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) and (curAtk > 0 or diffBaseAtk > 0) then - table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.ATK) + if not table.containValue(showAttrType, GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()]) and (curAtk > 0 or diffBaseAtk > 0) then + table.insert(showAttrType, GConst.MATCH_ATTACK_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_5") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_3).."") local numStr = curAtk // DEFAULT_FACTOR @@ -96,8 +96,8 @@ function WeaponInfoComp:refresh() numStr = numStr .. "+" .. diffBaseAtk .. "" end txNum:setText(numStr) - elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) and (curNormalHurt > 0 or diffBaseNormalHurt > 0) then - table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.NORMAL_HURT) + elseif not table.containValue(showAttrType, GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()]) and (curNormalHurt > 0 or diffBaseNormalHurt > 0) then + table.insert(showAttrType, GConst.MATCH_NORMAL_HURT_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_20") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT).."") local numStr = curNormalHurt // DEFAULT_FACTOR @@ -105,8 +105,8 @@ function WeaponInfoComp:refresh() numStr = numStr .. "+" .. diffBaseNormalHurt .. "" end txNum:setText(numStr) - elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) and (curSkillHurt > 0 or diffBaseSkillHurt > 0) then - table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.SKILL_HURT) + elseif not table.containValue(showAttrType, GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()]) and (curSkillHurt > 0 or diffBaseSkillHurt > 0) then + table.insert(showAttrType, GConst.MATCH_SKILL_HURT_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_21") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT).."") local numStr = curSkillHurt // DEFAULT_FACTOR @@ -114,8 +114,8 @@ function WeaponInfoComp:refresh() numStr = numStr .. "+" .. diffBaseSkillHurt .. "" end txNum:setText(numStr) - elseif not table.containValue(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) and (curHp > 0 or diffBaseHp > 0) then - table.insert(showAttrType, GConst.EquipConst.ATTR_TYPE.HP) + elseif not table.containValue(showAttrType, GConst.MATCH_HP_NAME[self.heroEntity:getMatchType()]) and (curHp > 0 or diffBaseHp > 0) then + table.insert(showAttrType, GConst.MATCH_HP_NAME[self.heroEntity:getMatchType()]) imgIcon:setSprite(GConst.ATLAS_PATH.COMMON, "common_dec_4") txTitle:setText(""..I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_2).."") local numStr = curHp // DEFAULT_FACTOR diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index d378a556..7e5da6f2 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -216,7 +216,7 @@ function MainCityUI:_bind() self:refreshBottomRp() end) - self:bind(DataManager.CollectionData, "dirtyHero", function() + self:bind(DataManager.CollectionData, "isDirty", function() self:refreshBottomRp() end) diff --git a/lua/app/userdata/collection/collection_base_entity.lua b/lua/app/userdata/collection/collection_base_entity.lua deleted file mode 100644 index 1165a852..00000000 --- a/lua/app/userdata/collection/collection_base_entity.lua +++ /dev/null @@ -1,97 +0,0 @@ -local CollectionBaseEntity = class("CollectionBaseEntity", BaseData) - --- 需要继承重写的部分 *********************************************************** - --- 初始化服务器数据 -function CollectionBaseEntity:init(data) -end - --- 是否有红点 -function CollectionBaseEntity:hasRedPoint() - return nil -end - --- 获取当前收集值 -function CollectionBaseEntity:getCurCollectPoint() - return nil -end - --- 获取当前已领取奖励图鉴等级 -function CollectionBaseEntity:getCurCollectLevel() - return nil -end - --- 获取总收集值 -function CollectionBaseEntity:getTotalCollectPoint() - return nil -end - --- 获取收集目标列表 -function CollectionBaseEntity:getCollectList() - return nil -end - --- 获取收集奖励列表 -function CollectionBaseEntity:getRewardList() - return nil -end - --- 获取当前所在档位id -function CollectionBaseEntity:getCurTargetId() - return nil -end - --- 获取档位的总目标值 -function CollectionBaseEntity:getGearTotalValue(id) - return nil -end - --- 获取当前收集值在档位的值 -function CollectionBaseEntity:getGearTotalValue(id) - return nil -end - --- 获取奖励档位收集进度 -function CollectionBaseEntity:getRewardTargetProgress(id) - return nil -end - --- 获取当前可领奖or正在进行中的目标 -function CollectionBaseEntity:getCanGetOrCollectingTargetId() - return nil -end - --- 获取收集目标点数 -function CollectionBaseEntity:getTargetPoint(id) - return nil -end - --- 获取基于目标收集点数的当前收集值 -function CollectionBaseEntity:getTargetOwnedPoint(id) - return nil -end - --- 获取可领取收集值 -function CollectionBaseEntity:getCanCollectPoint() - return nil -end - --- 奖励是否已领取 -function CollectionBaseEntity:isRewardReceived(id) - return nil -end - --- 是否满足奖励领取条件 -function CollectionBaseEntity:isMeetTargetPoint(id) - return nil -end - --- 领取收集点数成功 -function CollectionBaseEntity:onGetedPointSuccess(id, point) -end - --- 领取图鉴奖励成功 -function CollectionBaseEntity:onGetedPointRewardSuccess() -end - -return CollectionBaseEntity \ No newline at end of file diff --git a/lua/app/userdata/collection/collection_data.lua b/lua/app/userdata/collection/collection_data.lua index 2e4e361f..79593e1a 100644 --- a/lua/app/userdata/collection/collection_data.lua +++ b/lua/app/userdata/collection/collection_data.lua @@ -1,7 +1,7 @@ local CollectionData = class("CollectionData", BaseData) function CollectionData:ctor() - self.data.dirtyHero = false + self.data.isDirty = false end function CollectionData:clear() @@ -10,33 +10,19 @@ end function CollectionData:init(data) data = data or GConst.EMPTY_TABLE - self:initCollectHero(data.hero) -end - --- 初始化英雄图鉴数据 -function CollectionData:initCollectHero(data) if EDITOR_MODE then - Logger.logHighlight("更新英雄图鉴数据") + Logger.logHighlight("收集数据") Logger.printTable(data) end - self:initAllDataClass() - self.dataCollects[GConst.CollectionConst.TYPE.HERO]:init(data) - self:setDirty(GConst.CollectionConst.TYPE.HERO) + self.curLevel = data.level or 0 + self.curPoint = data.point or 0 + self.collectHero = data.Heroes or GConst.EMPTY_TABLE + self.collectSkin = data.Skins or GConst.EMPTY_TABLE end --- 初始化所有图鉴数据类 -function CollectionData:initAllDataClass() - if self.dataCollects == nil then - self.dataCollects = {} - self.dataCollects[GConst.CollectionConst.TYPE.HERO] = require "app/userdata/collection/collection_hero_entity":create() - end -end - -function CollectionData:setDirty(collectionType) - if collectionType == GConst.CollectionConst.TYPE.HERO then - self.data.dirtyHero = not self.data.dirtyHero - end +function CollectionData:setDirty() + self.data.isDirty = not self.data.isDirty end function CollectionData:isOpen() @@ -46,92 +32,277 @@ function CollectionData:isOpen() return true end -function CollectionData:getCollectEntity(collectionType) - return self.dataCollects[collectionType] -end - -- 是否有红点 -function CollectionData:hasRedPoint(collectionType) - return self:isOpen() and self.dataCollects[collectionType]:hasRedPoint() +function CollectionData:hasRedPoint() + if not self:isOpen() then + return false + end + + -- 可领点数 + for idx, data in pairs(self:getCollectList(GConst.CollectionConst.TYPE.HERO)) do + if self:getCanCollectPoint(GConst.CollectionConst.TYPE.HERO, data.id) > 0 then + return true + end + end + for idx, data in pairs(self:getCollectList(GConst.CollectionConst.TYPE.SKIN)) do + if self:getCanCollectPoint(GConst.CollectionConst.TYPE.HERO, data.id) > 0 then + return true + end + end + + -- 可领奖励 + for id, data in pairs(self:getRewardList()) do + if self:isMeetTargetPoint(id) and not self:isRewardReceived(id) then + return true + end + end + + return false end -- 获取当前收集值 -function CollectionData:getCurCollectPoint(collectionType) - return self.dataCollects[collectionType]:getCurCollectPoint() +function CollectionData:getCurCollectPoint() + return self.curPoint end -- 获取当前已领取奖励图鉴等级 -function CollectionData:getCurCollectLevel(collectionType) - return self.dataCollects[collectionType]:getCurCollectLevel() +function CollectionData:getCurCollectLevel() + return self.curLevel end -- 获取总收集值 -function CollectionData:getTotalCollectPoint(collectionType) - return self.dataCollects[collectionType]:getTotalCollectPoint() +function CollectionData:getTotalCollectPoint() + local list = self:getRewardList() + if not list or #list <= 0 then + return 0 + end + return list[#list].point end -- 获取收集目标列表 -function CollectionData:getCollectList(collectionType) - return self.dataCollects[collectionType]:getCollectList() +function CollectionData:getCollectList(type) + if type == GConst.CollectionConst.TYPE.HERO then + if self.heroList == nil then + self.heroList = {} + for id, data in pairs(ConfigManager:getConfig("hero")) do + data.id = id + table.insert(self.heroList, data) + end + table.sort(self.heroList, function(a, b) + if a.qlt ~= b.qlt then + return a.qlt > b.qlt + end + return a.id > b.id + end) + -- Logger.printTable(self.heroList) + end + return self.heroList + elseif type == GConst.CollectionConst.TYPE.SKIN then + if self.skinList == nil then + self.skinList = {} + for id, data in pairs(ConfigManager:getConfig("skin")) do + if data.qlt > 1 then + data.id = id + table.insert(self.skinList, data) + end + end + table.sort(self.skinList, function(a, b) + if a.qlt ~= b.qlt then + return a.qlt > b.qlt + end + return a.id > b.id + end) + -- Logger.printTable(self.skinList) + end + return self.skinList + end end -- 获取收集奖励列表 -function CollectionData:getRewardList(collectionType) - return self.dataCollects[collectionType]:getRewardList() +function CollectionData:getRewardList() + if self.cfgRewards == nil then + self.cfgRewards = ConfigManager:getConfig("collection") + end + + return self.cfgRewards end --- 获取当前所在档位id -function CollectionData:getCurTargetId(collectionType) - return self.dataCollects[collectionType]:getCurTargetId() +-- 获取当前收集点数所在档位id +function CollectionData:getCurTargetId() + for id, data in pairs(self:getRewardList()) do + local prog = self:getRewardTargetProgress(id) + if prog >= 0 and prog < 1 then + -- 在进度条范围内 + return id + end + end + return nil end -- 获取奖励档位收集进度 -function CollectionData:getRewardTargetProgress(collectionType, id) - return self.dataCollects[collectionType]:getRewardTargetProgress(id) +function CollectionData:getRewardTargetProgress(id) + local cur = self:getCurCollectPoint() + local rangeMin = self:getTargetMinPoint(id) + local rangeMax = self:getTargetMaxPoint(id) + -- Logger.logHighlight(id.."档位范围:"..rangeMin.."->"..rangeMax) + + if cur >= rangeMax then + -- 超过进度条 + return 1 + elseif cur < rangeMin then + --低于进度条 + return -1 + elseif cur == rangeMin then + -- 进度最低值 + return 0 + else + -- 在进度条范围内 + return (cur - rangeMin) / (rangeMax - rangeMin) + end end -- 获取当前可领奖or正在进行中的目标 -function CollectionData:getCanGetOrCollectingTargetId(collectionType) - return self.dataCollects[collectionType]:getCanGetOrCollectingTargetId() +function CollectionData:getCanGetOrCollectingTargetId() + for id, data in pairs(self:getRewardList()) do + if not self:isMeetTargetPoint(id) then + return id + end + + if not self:isRewardReceived(id) then + return id + end + end + return nil end -- 获取收集目标点数 -function CollectionData:getTargetPoint(collectionType, id) - return self.dataCollects[collectionType]:getTargetPoint(id) +function CollectionData:getTargetPoint(id) + local targetPoint = self:getRewardList()[id].point + local lastTarget = self:getLastTarget(id) + if lastTarget then + return targetPoint - lastTarget.point + end + return targetPoint end -- 获取基于目标收集点数的当前收集值 -function CollectionData:getTargetOwnedPoint(collectionType, id) - return self.dataCollects[collectionType]:getTargetOwnedPoint(id) +function CollectionData:getTargetOwnedPoint(id) + local curPoint = self:getCurCollectPoint() + local lastTarget = self:getLastTarget(id) + if lastTarget then + return curPoint - lastTarget.point + end + return curPoint end --- 获取可领取收集值 -function CollectionData:getCanCollectPoint(collectionType, id) - return self.dataCollects[collectionType]:getCanCollectPoint(id) +-- 获取可领取收集值，小于等于0为无点数，反之有可领取点数 +function CollectionData:getCanCollectPoint(type, id) + if type == GConst.CollectionConst.TYPE.HERO then + -- 基础奖励值 * 升级可领取次数 + local result = 0 + local heroEntity = DataManager.HeroData:getHeroById(id) + if heroEntity then + local curLevel = heroEntity:getLv() + local collectedLevel = self.collectHero[heroEntity:getCfgId()] + if collectedLevel == nil then + collectedLevel = 0 + end + result = (curLevel - collectedLevel) * heroEntity:getCollectionPoint() + end + return result + elseif type == GConst.CollectionConst.TYPE.SKIN then + if self.collectSkin[id] and self.collectSkin[id] > 0 then + -- 已收集 + return 0 + end + + local cfg = ConfigManager:getConfig("skin")[id] + return cfg and cfg.skin_point or 0 + end end -- 奖励是否已领取 -function CollectionData:isRewardReceived(collectionType, id) - return self.dataCollects[collectionType]:isRewardReceived(id) +function CollectionData:isRewardReceived(id) + return self.curLevel >= id end -- 是否满足奖励领取条件 -function CollectionData:isMeetTargetPoint(collectionType, id) - return self.dataCollects[collectionType]:isMeetTargetPoint(id) +function CollectionData:isMeetTargetPoint(id) + return self.curPoint >= self:getRewardList()[id].point +end + +-- 独有逻辑 ----------------------------------------------------------------------------------------------- + +-- 获取档位范围最低值 +function CollectionData:getTargetMinPoint(id) + local rangeMin = 0 + local curPoint = self:getRewardList()[id].point + local lastTarget = self:getLastTarget(id) + if lastTarget then + rangeMin = curPoint - math.floor((curPoint - lastTarget.point) / 2) + end + return rangeMin +end + +-- 获取档位范围最高值 +function CollectionData:getTargetMaxPoint(id) + local rangeMax = 0 + local curPoint = self:getRewardList()[id].point + local nextTarget = self:getNextTarget(id) + if nextTarget then + rangeMax = curPoint + math.floor((nextTarget.point - curPoint) / 2) + else + rangeMax = curPoint + end + return rangeMax +end + +-- 获取上一个低档位 +function CollectionData:getLastTarget(targetId) + local result = nil + for id, data in pairs(self:getRewardList()) do + if id == targetId then + return result + end + result = data + end + return nil +end + +-- 获取下一个高档位 +function CollectionData:getNextTarget(targetId) + local finded = false + for id, data in pairs(self:getRewardList()) do + if finded then + return data + end + if id == targetId then + finded = true + end + end + return nil end -- 事件 ----------------------------------------------------------------------------------------------- -- 领取收集点数成功 -function CollectionData:onGetedPointSuccess(collectionType, heroId, point) - self.dataCollects[collectionType]:onGetedPointSuccess(heroId, point) - self:setDirty(collectionType) +function CollectionData:onGetedPointSuccess(type, id, point) + if type == GConst.CollectionConst.TYPE.HERO then + if not self.collectHero[id] then + self.collectHero[id] = 0 + end + self.collectHero[id] = DataManager.heroData:getHeroById(id):getLv() + elseif type == GConst.CollectionConst.TYPE.SKIN then + self.collectSkin[id] = 1 + end + self.curPoint = point + self:setDirty() end -- 领取图鉴奖励成功 -function CollectionData:onGetedPointRewardSuccess(collectionType) - self.dataCollects[collectionType]:onGetedPointRewardSuccess() - self:setDirty(collectionType) +function CollectionData:onGetedPointRewardSuccess() + self.curLevel = self.curLevel + 1 + self:setDirty() end return CollectionData \ No newline at end of file diff --git a/lua/app/userdata/collection/collection_hero_entity.lua b/lua/app/userdata/collection/collection_hero_entity.lua deleted file mode 100644 index 96d714bc..00000000 --- a/lua/app/userdata/collection/collection_hero_entity.lua +++ /dev/null @@ -1,249 +0,0 @@ -local CollectBaseEntity = require "app/userdata/collection/collection_base_entity" -local CollectionHeroEntity = class("CollectionHeroEntity", CollectBaseEntity) - --- 英雄图鉴数据 - --- 初始化服务器数据 -function CollectionHeroEntity:init(data) - if data then - self.curlevel = data.level or 0 - self.curPoint = data.point or 0 - else - self.curlevel = 0 - self.curPoint = 0 - end -end - --- 是否有红点 -function CollectionHeroEntity:hasRedPoint() - - -- 可领点数 - for idx, data in pairs(self:getCollectList()) do - if self:getCanCollectPoint(data.id) > 0 then - return true - end - end - - -- 可领奖励 - for id, data in pairs(self:getRewardList()) do - if self:isMeetTargetPoint(id) and not self:isRewardReceived(id) then - return true - end - end - - return false -end - --- 获取当前收集值 -function CollectionHeroEntity:getCurCollectPoint() - return self.curPoint -end - --- 获取当前已领取奖励图鉴等级 -function CollectionHeroEntity:getCurCollectLevel() - return self.curlevel -end - --- 获取总收集值 -function CollectionHeroEntity:getTotalCollectPoint() - local list = self:getRewardList() - if not list or #list <= 0 then - return 0 - end - return list[#list].point -end - --- 获取收集目标列表 -function CollectionHeroEntity:getCollectList() - if self.heroList == nil then - self.heroList = {} - for id, data in pairs(ConfigManager:getConfig("hero")) do - data.id = id - table.insert(self.heroList, data) - end - table.sort(self.heroList, function(a, b) - if a.qlt ~= b.qlt then - return a.qlt > b.qlt - end - return a.id > b.id - end) - -- Logger.printTable(self.heroList) - end - return self.heroList -end - --- 获取收集奖励列表 -function CollectionHeroEntity:getRewardList() - if self.cfgRewards == nil then - self.cfgRewards = ConfigManager:getConfig("collection") - end - - return self.cfgRewards -end - --- 获取当前收集点数所在档位id -function CollectionHeroEntity:getCurTargetId() - for id, data in pairs(self:getRewardList()) do - local prog = self:getRewardTargetProgress(id) - if prog >= 0 and prog < 1 then - -- 在进度条范围内 - return id - end - end - return nil -end - --- 获取奖励档位收集进度 -function CollectionHeroEntity:getRewardTargetProgress(id) - local cur = self:getCurCollectPoint() - local rangeMin = self:getTargetMinPoint(id) - local rangeMax = self:getTargetMaxPoint(id) - -- Logger.logHighlight(id.."档位范围:"..rangeMin.."->"..rangeMax) - - if cur >= rangeMax then - -- 超过进度条 - return 1 - elseif cur < rangeMin then - --低于进度条 - return -1 - elseif cur == rangeMin then - -- 进度最低值 - return 0 - else - -- 在进度条范围内 - return (cur - rangeMin) / (rangeMax - rangeMin) - end -end - --- 获取当前可领奖or正在进行中的目标 -function CollectionHeroEntity:getCanGetOrCollectingTargetId() - for id, data in pairs(self:getRewardList()) do - if not self:isMeetTargetPoint(id) then - return id - end - - if not self:isRewardReceived(id) then - return id - end - end - return nil -end - --- 获取收集目标点数 -function CollectionHeroEntity:getTargetPoint(id) - local targetPoint = self:getRewardList()[id].point - local lastTarget = self:getLastTarget(id) - if lastTarget then - return targetPoint - lastTarget.point - end - return targetPoint -end - --- 获取基于目标收集点数的当前收集值 -function CollectionHeroEntity:getTargetOwnedPoint(id) - local curPoint = self:getCurCollectPoint() - local lastTarget = self:getLastTarget(id) - if lastTarget then - return curPoint - lastTarget.point - end - return curPoint -end - --- 获取可领取收集值 -function CollectionHeroEntity:getCanCollectPoint(id) - -- 基础奖励值 * 升级可领取次数 - -- 小于等于0为无点数，反之有可领取点数 - - local result = 0 - local heroEntity = DataManager.HeroData:getHeroById(id) - if heroEntity then - local curLevel = heroEntity:getLv() - local collectedLevel = heroEntity:getCollectionLevel() - result = (curLevel - collectedLevel) * heroEntity:getCollectionPoint() - end - return result -end - --- 获取一级可领取收集值 -function CollectionHeroEntity:getOneLevelCanCollectPoint(id) - local heroEntity = DataManager.HeroData:getHeroById(id) - if heroEntity then - return heroEntity:getCollectionPoint() - end - return nil -end - --- 奖励是否已领取 -function CollectionHeroEntity:isRewardReceived(id) - return self.curlevel >= id -end - --- 是否满足奖励领取条件 -function CollectionHeroEntity:isMeetTargetPoint(id) - return self.curPoint >= self:getRewardList()[id].point -end - --- 领取收集点数成功 -function CollectionHeroEntity:onGetedPointSuccess(id, point) - DataManager.HeroData:getHeroById(id):updateCollectionLevel() - self.curPoint = point -end - --- 领取图鉴奖励成功 -function CollectionHeroEntity:onGetedPointRewardSuccess() - self.curlevel = self.curlevel + 1 -end - --- 独有逻辑 ----------------------------------------------------------------------------------------------- - --- 获取档位范围最低值 -function CollectionHeroEntity:getTargetMinPoint(id) - local rangeMin = 0 - local curPoint = self:getRewardList()[id].point - local lastTarget = self:getLastTarget(id) - if lastTarget then - rangeMin = curPoint - math.floor((curPoint - lastTarget.point) / 2) - end - return rangeMin -end - --- 获取档位范围最高值 -function CollectionHeroEntity:getTargetMaxPoint(id) - local rangeMax = 0 - local curPoint = self:getRewardList()[id].point - local nextTarget = self:getNextTarget(id) - if nextTarget then - rangeMax = curPoint + math.floor((nextTarget.point - curPoint) / 2) - else - rangeMax = curPoint - end - return rangeMax -end - --- 获取上一个低档位 -function CollectionHeroEntity:getLastTarget(targetId) - local result = nil - for id, data in pairs(self:getRewardList()) do - if id == targetId then - return result - end - result = data - end - return nil -end - --- 获取下一个高档位 -function CollectionHeroEntity:getNextTarget(targetId) - local finded = false - for id, data in pairs(self:getRewardList()) do - if finded then - return data - end - if id == targetId then - finded = true - end - end - return nil -end - -return CollectionHeroEntity \ No newline at end of file diff --git a/lua/app/userdata/hero/hero_data.lua b/lua/app/userdata/hero/hero_data.lua index 8d7c8fc1..74d4d439 100644 --- a/lua/app/userdata/hero/hero_data.lua +++ b/lua/app/userdata/hero/hero_data.lua @@ -89,7 +89,7 @@ function HeroData:addHero(heroStruct) end function HeroData:getEntity(heroStruct) - return HeroEntity:create(heroStruct.id, heroStruct.level, heroStruct.collection_level) + return HeroEntity:create(heroStruct.id, heroStruct.level, heroStruct.skin) end function HeroData:getHeroById(id) @@ -97,7 +97,7 @@ function HeroData:getHeroById(id) return end if not self.heroes[id] then - self.heroes[id] = self:getEntity({id = id, level = 0, collection_level = 0}) + self.heroes[id] = self:getEntity({id = id, level = 0, skin = 0}) end return self.heroes[id] end @@ -196,7 +196,7 @@ function HeroData:getRp() end end - if DataManager.CollectionData:hasRedPoint(GConst.CollectionConst.TYPE.HERO) then + if DataManager.CollectionData:hasRedPoint() then return true end diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 645e93c9..8b95144b 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -1,16 +1,17 @@ local HeroEntity = class("HeroEntity", BaseData) local ATTR_NAME = GConst.BattleConst.ATTR_NAME -function HeroEntity:ctor(cfgId, lv, collectionLevel) +function HeroEntity:ctor(cfgId, lv, skin) self.cfgId = cfgId self.data.isDirty = false self.data.lv = lv - self.data.collectionLevel = collectionLevel + self.data.skin = skin self.config = ConfigManager:getConfig("hero")[self.cfgId] self.beginLv = self.config.begin_lv -- 初始等级 self.baseAttrOriginal = {} self.equipAttr = {} + self.skinAttr = {} self.allAttr = {} end @@ -47,6 +48,12 @@ function HeroEntity:onEquipAttrChange() self:setDirty() end +function HeroEntity:onSkinAttrChange() + self:updateSkinAttr() + self:updateTotalAttr() + self:setDirty() +end + function HeroEntity:setDirty() self.data.isDirty = not self.data.isDirty end @@ -59,6 +66,7 @@ end function HeroEntity:updateAllAttr() self:updateBaseAttr() self:updateEquipAttr() + self:updateSkinAttr() self:updateTotalAttr() end @@ -145,6 +153,49 @@ function HeroEntity:addEquipAttrValue(name, value) self.equipAttr[name] = self.equipAttr[name] + value end +-- 更新皮肤属性 +function HeroEntity:updateSkinAttr() + self.skinAttr = {} + if #DataManager.SkinData:getOwnAllAttr(self:getCfgId()) <= 0 then + return + end + + local hp = DataManager.SkinData:getHp(self:getCfgId()) + local atk = DataManager.SkinData:getAttack(self:getCfgId()) + local normalHurt = DataManager.SkinData:getNormalHurt(self:getCfgId()) + local skillHurt = DataManager.SkinData:getSkillHurt(self:getCfgId()) + local critPer = DataManager.SkinData:getCritPercent(self:getCfgId()) + local critHurtPer = DataManager.SkinData:getCritHurtPercent(self:getCfgId()) + local normalHurtPer = DataManager.SkinData:getNormalHurtPercent(self:getCfgId()) + local skillHurtPer = DataManager.SkinData:getSkillHurtPercent(self:getCfgId()) + local healPer = DataManager.SkinData:getHealPercent(self:getCfgId()) + + self.skinAttr[GConst.MATCH_HP_NAME[self:getMatchType()]] = hp + self.skinAttr[GConst.MATCH_ATTACK_NAME[self:getMatchType()]] = atk + self.skinAttr[GConst.MATCH_NORMAL_HURT_NAME[self:getMatchType()]] = normalHurt + self.skinAttr[GConst.MATCH_SKILL_HURT_NAME[self:getMatchType()]] = skillHurt + self.skinAttr[GConst.MATCH_CRIT_NAME[self:getMatchType()]] = critPer + self.skinAttr[GConst.MATCH_CRIT_TIME_NAME[self:getMatchType()]] = critHurtPer + self.skinAttr[GConst.MATCH_NORMAL_HURTP_NAME[self:getMatchType()]] = normalHurtPer + self.skinAttr[GConst.MATCH_SKILL_HURTP_NAME[self:getMatchType()]] = skillHurtPer + self.skinAttr[GConst.MATCH_CURED_NAME[self:getMatchType()]] = healPer + + if EDITOR_MODE then + local printStr = "" + printStr = printStr .. "更新皮肤数值："..self:getCfgId() .. "\n" + printStr = printStr .. "生命：".. hp .. "\n" + printStr = printStr .. "攻击力：".. atk .. "\n" + printStr = printStr .. "普攻增伤：".. normalHurt .. "\n" + printStr = printStr .. "技能增伤：".. skillHurt .. "\n" + printStr = printStr .. "暴击率：".. critPer .. "\n" + printStr = printStr .. "暴击伤害百分比：".. critHurtPer .. "\n" + printStr = printStr .. "普攻增伤百分比：".. normalHurtPer .. "\n" + printStr = printStr .. "技能增伤百分比：".. skillHurtPer .. "\n" + printStr = printStr .. "治疗加成百分比：".. healPer .. "\n" + Logger.logHighlight(printStr) + end +end + -- 更新总属性 function HeroEntity:updateTotalAttr() self.allAttr = {} @@ -154,6 +205,9 @@ function HeroEntity:updateTotalAttr() for k, v in pairs(self.equipAttr) do self:addTotalAttrValue(k, v) end + for k, v in pairs(self.skinAttr) do + self:addTotalAttrValue(k, v) + end end function HeroEntity:setTotalAttrValue(name, value) @@ -200,6 +254,20 @@ function HeroEntity:getLv() return self.data.lv end +-- 获取当前穿戴皮肤 +function HeroEntity:getSkinId() + if self.data.skin == nil or self.data.skin == 0 then + return DataManager.SkinData:getOriginSkinId(self:getCfgId()) + end + return self.data.skin +end + +-- 穿戴皮肤 +function HeroEntity:onChangeSkin(skinId) + self.data.skin = skinId + self:setDirty() +end + function HeroEntity:getQlt() return self.config.qlt end @@ -212,16 +280,6 @@ function HeroEntity:getMatchType() return self.config.position end --- 获取英雄已领取图鉴点数的等级 -function HeroEntity:getCollectionLevel() - return self.data.collectionLevel -end - --- 更新英雄图鉴已领取等级 -function HeroEntity:updateCollectionLevel() - self.data.collectionLevel = self:getLv() -end - -- 英雄每级可领取图鉴点数 function HeroEntity:getCollectionPoint() return self.config.collection_point @@ -346,7 +404,8 @@ function HeroEntity:getConfig() end function HeroEntity:getModelId() - return self.config.model_id + local skinModel = DataManager.SkinData:getModelId(self:getSkinId()) + return skinModel or self.config.model_id end function HeroEntity:getBaseSkill() @@ -374,7 +433,8 @@ function HeroEntity:getHurtNum() end function HeroEntity:getName() - return ModuleManager.HeroManager:getHeroName(self:getCfgId()) + local skinName = DataManager.SkinData:getName(self:getSkinId()) + return skinName or ModuleManager.HeroManager:getHeroName(self:getCfgId()) end function HeroEntity:getDesc() @@ -426,9 +486,9 @@ function HeroEntity:getActiveRogueSkills() return list end --- 获取总基础生命值（英雄+装备） +-- 获取总基础生命值（英雄+装备+皮肤） function HeroEntity:getTotalBaseHp() - local result = self:getCfgHp() + local result = self:isActived() and self:getCfgHp() or self:getCfgHp(self:getBeginLv()) -- 武器 + 防具 for partName, partType in pairs(GConst.EquipConst.PART_TYPE) do local equipEntity = self:getEquips(partType) @@ -436,12 +496,13 @@ function HeroEntity:getTotalBaseHp() result = result + equipEntity:getBaseHp() end end + result = result + DataManager.SkinData:getBaseHp(self:getCfgId()) return result end --- 获取总基础攻击值（英雄+装备） +-- 获取总基础攻击值（英雄+装备+皮肤） function HeroEntity:getTotalBaseAtk() - local result = self:getCfgAtk() + local result = self:isActived() and self:getCfgAtk() or self:getCfgAtk(self:getBeginLv()) -- local logStr = self:getCfgId() .. "总基础攻击值:\n英雄：" .. result -- 武器 + 防具 for partName, partType in pairs(GConst.EquipConst.PART_TYPE) do @@ -452,6 +513,7 @@ function HeroEntity:getTotalBaseAtk() end end -- Logger.logHighlight(logStr) + result = result + DataManager.SkinData:getBaseAttack(self:getCfgId()) return result end diff --git a/lua/app/userdata/skin.meta b/lua/app/userdata/skin.meta new file mode 100644 index 00000000..759859b9 --- /dev/null +++ b/lua/app/userdata/skin.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d811eef2a37221488059bb70d257a46 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/userdata/skin/skin_data.lua b/lua/app/userdata/skin/skin_data.lua new file mode 100644 index 00000000..89ab302e --- /dev/null +++ b/lua/app/userdata/skin/skin_data.lua @@ -0,0 +1,301 @@ +local SkinData = class("SkinData", BaseData) +local DEFAULT_SKIN_QLT = 1 -- 默认皮肤品质 +local DEFAULT_FACTOR = GConst.BattleConst.DEFAULT_FACTOR + +function SkinData:ctor() + self.data.isDirty = false +end + +function SkinData:clear() +end + +function SkinData:init(data) + data = data or GConst.EMPTY_TABLE + if EDITOR_MODE then + Logger.logHighlight("皮肤解锁数据") + Logger.printTable(data) + end + + self.unlockList = data +end + +function SkinData:setDirty() + self.data.isDirty = not self.data.isDirty +end + +function SkinData:isOpen(showToast) + if not ModuleManager:getIsOpen(ModuleManager.MODULE_KEY.SKIN, not showToast) then + return false + end + return true +end + +-- 是否解锁 +function SkinData:isUnlock(skinId) + return self.unlockList[skinId] or self:getSkinCfg(skinId).qlt == DEFAULT_SKIN_QLT +end + +-- 是否穿戴 +function SkinData:isActived(skinId) + local heroId = self:getHeroIdBySkinId(skinId) + return DataManager.HeroData:getHeroById(heroId):getSkinId() == skinId +end + +-- 获取皮肤配置 +function SkinData:getSkinCfg(skinId) + return ConfigManager:getConfig("skin")[skinId] +end + +-- 获取英雄所有皮肤id(原皮>使用中>已解锁>未解锁>id) +function SkinData:getHeroAllSkinIdsSort(heroId) + local result = {} + local originSkinId = self:getOriginSkinId(heroId) + for index, skinId in ipairs(ConfigManager:getConfig("hero")[heroId].skin) do + table.insert(result, {id = skinId, sort = skinId}) + end + + for index, info in ipairs(result) do + local cfg = self:getSkinCfg(info.id) + if cfg == nil then + Logger.printTable(info) + end + local sort = info.id + sort = sort + 10000000 * cfg.qlt + + if info.id == originSkinId then + sort = sort + 500000000000 + end + if self:isUnlock(info.id) then + sort = sort + 300000000000 + if self:isActived(info.id) then + sort = sort + 400000000000 + else + sort = sort + 300000000000 + end + else + sort = sort + 100000000000 + end + + info.sort = sort + end + table.sort(result, function(a, b) + return a.sort > b.sort + end) + + return result +end + +-- 获取皮肤id所对应英雄id +function SkinData:getHeroIdBySkinId(skinId) + local cfg = self:getSkinCfg(skinId) + return cfg and cfg.hero_id +end + +-- 获取皮肤id所对应道具id +function SkinData:getItemIdBySkinId(skinId) + local cfg = self:getSkinCfg(skinId) + return cfg and cfg.item_id +end + +-- 获取道具id所对应的皮肤id +function SkinData:getSkinIdByItemId(itemId) + local data, id = table.find(ConfigManager:getConfig("skin"), function(info) + return info.item_id == itemId + end) + return id +end + +-- 获取英雄原始皮肤id +function SkinData:getOriginSkinId(heroId) + local data, id = table.find(ConfigManager:getConfig("skin"), function(info) + return info.hero_id == heroId and info.qlt == DEFAULT_SKIN_QLT + end) + return id +end + +-- 获取皮肤名称 +function SkinData:getName(skinId) + local name = I18N:getText("skin", skinId, "value") + if not name or name == "" or #name == 0 then + return nil + end + return name +end + +-- 获取模型id +function SkinData:getModelId(skinId) + local cfg = self:getSkinCfg(skinId) + return cfg and cfg.model_id or "p0001"-- 未配置模型id的处理 +end + +-- 获取皮肤来源 +function SkinData:getSource(skinId) + return I18N:getGlobalText("SKIN_GOT_" .. self:getSkinCfg(skinId).got) +end + +-- 获取皮肤属性 +function SkinData:getAttr(skinId) + return self:getSkinCfg(skinId).bonus +end + +-- 皮肤属性相关接口start------------------------------------------------------------------------------------ + +-- 英雄是否拥有某属性 +function SkinData:hasAttr(heroId, attrType) + if table.containValue(GConst.MATCH_HP_NAME, attrType) then + return self:getHp(heroId) > 0 + end + if table.containValue(GConst.MATCH_ATTACK_NAME, attrType) then + return self:getAttack(heroId) > 0 + end + return table.find(self:getOwnAllAttr(heroId), function(value) + return value.type == attrType + end) ~= nil +end + +-- 获取英雄已拥有的所有皮肤属性（未计算，仅配置的属性数据） +function SkinData:getOwnAllAttr(heroId) + local result = {} + for skinId, value in pairs(self.unlockList) do + local hero = self:getHeroIdBySkinId(skinId) + local attrs = self:getAttr(skinId) + if attrs and hero == heroId then + for index, attr in ipairs(attrs) do + local temp = table.find(result, function(value) + return value.type == attr.type + end) + + if temp then + temp.num = temp.num + attr.num + else + table.insert(result, attr) + end + end + end + end + return result +end + +-- 获取基础生命值 +function SkinData:getBaseHp(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_HP_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取加成后生命值 +function SkinData:getHp(heroId) + local result = self:getBaseHp(heroId) + local heroEntity = DataManager.HeroData:getHeroById(heroId) + result = result + heroEntity:getTotalBaseHp() * self:getHpPercent(heroId) // DEFAULT_FACTOR + return result +end + +-- 获取基础攻击力 +function SkinData:getBaseAttack(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_ATTACK_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取加成后攻击力 +function SkinData:getAttack(heroId) + local result = self:getBaseAttack(heroId) + local heroEntity = DataManager.HeroData:getHeroById(heroId) + result = result + heroEntity:getTotalBaseAtk() * self:getAtkPercent(heroId) // DEFAULT_FACTOR + return result +end + +-- 获取攻击加成百分比 +function SkinData:getAtkPercent(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_ATTACK_ADD_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取生命值加成百分比 +function SkinData:getHpPercent(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_HP_ADD_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取普攻伤害 +function SkinData:getNormalHurt(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_NORMAL_HURT_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取皮肤技能伤害 +function SkinData:getSkillHurt(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_SKILL_HURT_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取暴击率百分比 +function SkinData:getCritPercent(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_CRIT_NAME, value.type) + end) + return result and result.num or 0 +end + +--获取暴击伤害百分比 +function SkinData:getCritHurtPercent(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_CRIT_TIME_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取治疗百分比 +function SkinData:getHealPercent(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_CURED_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取普攻增伤百分比 +function SkinData:getNormalHurtPercent(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_NORMAL_HURTP_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 获取技能增伤百分比 +function SkinData:getSkillHurtPercent(heroId) + local result = table.find(self:getOwnAllAttr(heroId), function(value) + return table.containValue(GConst.MATCH_SKILL_HURTP_NAME, value.type) + end) + return result and result.num or 0 +end + +-- 皮肤属性相关接口end------------------------------------------------------------------------------------ + +-- 事件 -------------------------------------------------------------------------------------------------- + +-- 解锁皮肤 +function SkinData:onUnlockSkin(itemId) + local skinId = self:getSkinIdByItemId(itemId) + local heroId = self:getHeroIdBySkinId(skinId) + if skinId or heroId then + return + end + + self.unlockList[skinId] = Time:getServerTime() + DataManager.HeroData:getHeroById(heroId):onSkinAttrChange() + + self:setDirty() +end + +return SkinData \ No newline at end of file diff --git a/lua/app/userdata/skin/skin_data.lua.meta b/lua/app/userdata/skin/skin_data.lua.meta new file mode 100644 index 00000000..e5c90a02 --- /dev/null +++ b/lua/app/userdata/skin/skin_data.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: d2fe3ee6d2682544fb28407117b94543 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3}