diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 5a2c02af..ed388c2b 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -122,6 +122,9 @@ BIReport.ITEM_GET_TYPE = { ARENA_SETTLEMENT = "ArenaSettlement", ARENA_GIFT = "ArenaGift", COLLECTION_HERO_REWARD = "CollectionHeroReward", + DUNGEON_WEAPON_CHALLENGE = "DungeonWeaponChallenge", + DUNGEON_WEAPON_END = "DungeonWeaponEnd", + DUNGEON_WEAPON_SWEEP = "DungeonWeaponSweep", } BIReport.ADS_CLICK_TYPE = { @@ -167,6 +170,8 @@ BIReport.BATTLE_TYPE = { ["3"] = "DungeonGold", ["4"] = "DungeonShards", ["5"] = "Arena", + ["6"] = "DungeonWeapon", + ["7"] = "DungeonArmor", } BIReport.GIFT_TYPE = { diff --git a/lua/app/common/data_manager.lua b/lua/app/common/data_manager.lua index 680fbde3..fffe461d 100644 --- a/lua/app/common/data_manager.lua +++ b/lua/app/common/data_manager.lua @@ -133,11 +133,11 @@ function DataManager:initWithServerData(data) self.DailyChallengeData:init(data.chapter_daily_challenge) self.DungeonData:initDungeonGold(data.chapter_gold_challenge) self.DungeonData:initDungeonShards(data.chapter_shards_challenge) - self.DungeonData:initDungeonWeapon(data.chapter_weapon_challenge) - self.DungeonData:initDungeonArmor(data.chapter_armor_challenge) self.HeroData:init(data.bag.heroes) self.BagData:init(data.bag) self.FormationData:init(data.fight_info) + self.DungeonData:initDungeonWeapon(data.chapter_weapon_challenge) + self.DungeonData:initDungeonArmor(data.chapter_armor_challenge) self.CollectionData:init(data.collection) self.TutorialData:init(data.guide) self.MailData:init(data.mail_info) diff --git a/lua/app/config/chapter_dungeon_equip.lua b/lua/app/config/chapter_dungeon_equip.lua index d552311e..c9ad2094 100644 --- a/lua/app/config/chapter_dungeon_equip.lua +++ b/lua/app/config/chapter_dungeon_equip.lua @@ -8,11 +8,7 @@ local chapter_dungeon_equip = { 1 }, ["monster"]={ - 106, - 206, - 306, - 406, - 506 + 101, }, ["first_reward"]={ ["type"]=1, @@ -101,11 +97,7 @@ local chapter_dungeon_equip = { 2 }, ["monster"]={ - 606, - 706, - 806, - 906, - 1006 + 101, }, ["first_reward"]={ ["type"]=1, @@ -194,11 +186,7 @@ local chapter_dungeon_equip = { 3 }, ["monster"]={ - 1106, - 1206, - 1306, - 1406, - 1506 + 101 }, ["first_reward"]={ ["type"]=1, @@ -287,11 +275,7 @@ local chapter_dungeon_equip = { 4 }, ["monster"]={ - 1606, - 1706, - 1806, - 1906, - 2006 + 101 }, ["first_reward"]={ ["type"]=1, diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 6e72077b..6c941b5d 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -1,8 +1,5 @@ local LocalizationGlobalConst = { - ["DUNGEON_WEAPON_DESC_12"] = "DUNGEON_WEAPON_DESC_12", - ["DUNGEON_WEAPON_DESC_13"] = "DUNGEON_WEAPON_DESC_13", - ["DUNGEON_WEAPON_DESC_14"] = "DUNGEON_WEAPON_DESC_14", MAIN_BTN_1 = "MAIN_BTN_1", QLT_DESC_1 = "QLT_DESC_1", QLT_DESC_2 = "QLT_DESC_2", @@ -394,6 +391,11 @@ local LocalizationGlobalConst = ATTR_NORMAL_HURTP = "ATTR_NORMAL_HURTP", ATTR_SKILL_HURTP = "ATTR_SKILL_HURTP", ATTR_CURED = "ATTR_CURED", + DUNGEON_WEAPON_DESC_12 = "DUNGEON_WEAPON_DESC_12", + DUNGEON_WEAPON_DESC_13 = "DUNGEON_WEAPON_DESC_13", + DUNGEON_WEAPON_DESC_14 = "DUNGEON_WEAPON_DESC_14", + MOP_UP_DESC_1 = "MOP_UP_DESC_1", + MOP_UP_DESC_2 = "MOP_UP_DESC_2", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 44f9a8f1..db375d75 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -520,27 +520,27 @@ local monster_base = { ["model_ui"]=1.0 }, [20039]={ - ["model_id"]="m20034", + ["model_id"]="m20039", ["body"]=1, ["model_ui"]=1.0 }, [20040]={ - ["model_id"]="m20035", - ["body"]=1, - ["model_ui"]=1.0 - }, - [20041]={ - ["model_id"]="m20036", + ["model_id"]="m20040", ["body"]=1, ["model_ui"]=1.0 }, [20042]={ - ["model_id"]="m20037", + ["model_id"]="m20042", + ["body"]=1, + ["model_ui"]=1.0 + }, + [20041]={ + ["model_id"]="m20041", ["body"]=1, ["model_ui"]=1.0 }, [20043]={ - ["model_id"]="m20038", + ["model_id"]="m20043", ["body"]=1, ["model_ui"]=1.0 }, diff --git a/lua/app/config/monster_dungeon_equip.lua b/lua/app/config/monster_dungeon_equip.lua index 1741e8c2..bb6ede68 100644 --- a/lua/app/config/monster_dungeon_equip.lua +++ b/lua/app/config/monster_dungeon_equip.lua @@ -48,7 +48,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [506]={ - ["monster_base"]=20043, + ["monster_base"]=20041, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -117,7 +117,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [1006]={ - ["monster_base"]=20039, + ["monster_base"]=20040, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -128,7 +128,8 @@ local monster_dungeon_equip = { 30116 }, ["skill"]={ - 10085 + 10085, + 10129 }, ["passive_skill"]={ 10008 @@ -184,7 +185,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [1506]={ - ["monster_base"]=20040, + ["monster_base"]=20039, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -252,7 +253,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [2006]={ - ["monster_base"]=20041, + ["monster_base"]=20043, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -389,7 +390,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [3006]={ - ["monster_base"]=20043, + ["monster_base"]=20041, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -458,7 +459,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [3506]={ - ["monster_base"]=20039, + ["monster_base"]=20040, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -469,7 +470,8 @@ local monster_dungeon_equip = { 30131 }, ["skill"]={ - 10096 + 10096, + 10129 }, ["passive_skill"]={ 10008 @@ -525,7 +527,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [4006]={ - ["monster_base"]=20040, + ["monster_base"]=20039, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -593,7 +595,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [4506]={ - ["monster_base"]=20041, + ["monster_base"]=20043, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -730,7 +732,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [5506]={ - ["monster_base"]=20043, + ["monster_base"]=20041, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -799,7 +801,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [6006]={ - ["monster_base"]=20039, + ["monster_base"]=20040, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -810,7 +812,8 @@ local monster_dungeon_equip = { 30137 }, ["skill"]={ - 10107 + 10107, + 10129 }, ["passive_skill"]={ 10008 @@ -866,7 +869,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [6506]={ - ["monster_base"]=20040, + ["monster_base"]=20039, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -934,7 +937,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [7006]={ - ["monster_base"]=20041, + ["monster_base"]=20043, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -1071,7 +1074,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [8006]={ - ["monster_base"]=20043, + ["monster_base"]=20041, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -1140,7 +1143,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [8506]={ - ["monster_base"]=20039, + ["monster_base"]=20040, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -1151,7 +1154,8 @@ local monster_dungeon_equip = { 30143 }, ["skill"]={ - 10118 + 10118, + 10129 }, ["passive_skill"]={ 10008 @@ -1207,7 +1211,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [9006]={ - ["monster_base"]=20040, + ["monster_base"]=20039, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, @@ -1275,7 +1279,7 @@ local monster_dungeon_equip = { ["monster_exp"]=23000 }, [9506]={ - ["monster_base"]=20041, + ["monster_base"]=20043, ["is_boss"]=2, ["hp"]=240000000, ["atk"]=1590000, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 0d59a216..2c915b6c 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -9735,7 +9735,19 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=8000, ["ratio"]=10000, ["round"]=0 }, @@ -9747,6 +9759,15 @@ local skill = { } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 4 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -9754,8 +9775,7 @@ local skill = { ["sound_hit"]={ 10033 }, - ["name_act"]="skill01", - ["fx_self"]=200020 + ["name_act"]="skill01" }, [10086]={ ["effect_type"]=2, @@ -9782,12 +9802,26 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -9795,8 +9829,7 @@ local skill = { ["sound_hit"]={ 10058 }, - ["name_act"]="skill01", - ["fx_self"]=200146 + ["name_act"]="skill01" }, [10088]={ ["effect_type"]=1, @@ -9810,6 +9843,10 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["sound_hit"]={ @@ -9834,6 +9871,10 @@ local skill = { } }, ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -9841,7 +9882,7 @@ local skill = { ["sound_hit"]={ 10058 }, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10090]={ ["effect_type"]=2, @@ -9870,6 +9911,10 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01" @@ -9891,11 +9936,15 @@ local skill = { } }, ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10093]={ ["effect_type"]=2, @@ -9924,12 +9973,33 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -9948,9 +10018,13 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=3, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10096]={ ["skill_type"]=5, @@ -9959,7 +10033,19 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=8000, ["ratio"]=10000, ["round"]=0 }, @@ -9971,6 +10057,15 @@ local skill = { } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 4 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -9978,8 +10073,7 @@ local skill = { ["sound_hit"]={ 10033 }, - ["name_act"]="skill01", - ["fx_self"]=200020 + ["name_act"]="skill01" }, [10097]={ ["effect_type"]=2, @@ -10006,12 +10100,26 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -10019,8 +10127,7 @@ local skill = { ["sound_hit"]={ 10058 }, - ["name_act"]="skill01", - ["fx_self"]=200146 + ["name_act"]="skill01" }, [10099]={ ["effect_type"]=1, @@ -10034,6 +10141,10 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["sound_hit"]={ @@ -10058,6 +10169,10 @@ local skill = { } }, ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -10065,7 +10180,7 @@ local skill = { ["sound_hit"]={ 10058 }, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10101]={ ["effect_type"]=2, @@ -10094,6 +10209,10 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01" @@ -10115,11 +10234,15 @@ local skill = { } }, ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10104]={ ["effect_type"]=2, @@ -10148,12 +10271,33 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -10172,9 +10316,13 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=3, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10107]={ ["skill_type"]=5, @@ -10183,7 +10331,19 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=8000, ["ratio"]=10000, ["round"]=0 }, @@ -10195,6 +10355,15 @@ local skill = { } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 4 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -10202,8 +10371,7 @@ local skill = { ["sound_hit"]={ 10033 }, - ["name_act"]="skill01", - ["fx_self"]=200020 + ["name_act"]="skill01" }, [10108]={ ["effect_type"]=2, @@ -10230,12 +10398,26 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -10243,8 +10425,7 @@ local skill = { ["sound_hit"]={ 10058 }, - ["name_act"]="skill01", - ["fx_self"]=200146 + ["name_act"]="skill01" }, [10110]={ ["effect_type"]=1, @@ -10258,6 +10439,10 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["sound_hit"]={ @@ -10282,6 +10467,10 @@ local skill = { } }, ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -10289,7 +10478,7 @@ local skill = { ["sound_hit"]={ 10058 }, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10112]={ ["effect_type"]=2, @@ -10318,6 +10507,10 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01" @@ -10339,11 +10532,15 @@ local skill = { } }, ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10115]={ ["effect_type"]=2, @@ -10372,12 +10569,33 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -10396,9 +10614,13 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=3, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10118]={ ["skill_type"]=5, @@ -10407,7 +10629,19 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=6000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=8000, ["ratio"]=10000, ["round"]=0 }, @@ -10419,6 +10653,15 @@ local skill = { } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 4 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["shake_time"]=200, @@ -10426,8 +10669,7 @@ local skill = { ["sound_hit"]={ 10033 }, - ["name_act"]="skill01", - ["fx_self"]=200020 + ["name_act"]="skill01" }, [10119]={ ["effect_type"]=2, @@ -10454,12 +10696,26 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=2, ["cd_start"]=0, ["shake_time"]=200, @@ -10467,8 +10723,7 @@ local skill = { ["sound_hit"]={ 10058 }, - ["name_act"]="skill01", - ["fx_self"]=200146 + ["name_act"]="skill01" }, [10121]={ ["effect_type"]=1, @@ -10482,6 +10737,10 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["sound_hit"]={ @@ -10506,6 +10765,10 @@ local skill = { } }, ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -10513,7 +10776,7 @@ local skill = { ["sound_hit"]={ 10058 }, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10123]={ ["effect_type"]=2, @@ -10542,6 +10805,10 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=0, ["name_act"]="skill01" @@ -10563,11 +10830,15 @@ local skill = { } }, ["obj"]=2, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, ["shake_type"]=6, - ["name_act"]="skill01" + ["name_act"]="skill02" }, [10126]={ ["effect_type"]=2, @@ -10596,12 +10867,33 @@ local skill = { ["effect"]={ { ["type"]="hurt", - ["num"]=20000, + ["num"]=5000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=10000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="hurt", + ["num"]=15000, ["ratio"]=10000, ["round"]=0 } }, ["obj"]=2, + ["effect_block"]={ + 1, + 2, + 3 + }, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=2, ["shake_time"]=200, @@ -10620,9 +10912,73 @@ local skill = { } }, ["obj"]=1, + ["skill_position"]={ + 2, + 0 + }, ["cd"]=3, ["cd_start"]=3, - ["name_act"]="skill01" + ["name_act"]="skill02" + }, + [10129]={ + ["effect_type"]=1, + ["trigger"]=1, + ["effect"]={ + { + ["type"]="hurt", + ["num"]=7000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="burn", + ["num"]=5000, + ["ratio"]=2000, + ["round"]=2 + }, + { + ["type"]="hurt", + ["num"]=7000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="bleed", + ["num"]=3500, + ["ratio"]=2000, + ["round"]=2 + }, + { + ["type"]="hurt", + ["num"]=7000, + ["ratio"]=10000, + ["round"]=0 + }, + { + ["type"]="poison", + ["num"]=2500, + ["ratio"]=2000, + ["round"]=2 + } + }, + ["obj"]=2, + ["effect_block"]={ + 2, + 4, + 6 + }, + ["skill_position"]={ + 2, + 0 + }, + ["cd"]=3, + ["cd_start"]=2, + ["shake_time"]=200, + ["shake_type"]=6, + ["sound_hit"]={ + 10033 + }, + ["name_act"]="skill02" }, [20001]={ ["effect_type"]=1, @@ -18149,8 +18505,7 @@ local skill = { ["sound_hit"]={ 1000013 }, - ["name_act"]="attack01", - ["fx_self"]=200142 + ["name_act"]="attack01" }, [30115]={ ["effect_type"]=1, @@ -18179,8 +18534,7 @@ local skill = { ["sound_hit"]={ 1000013 }, - ["name_act"]="attack02", - ["fx_self"]=200143 + ["name_act"]="attack02" }, [30116]={ ["effect_type"]=1, @@ -18209,8 +18563,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30117]={ ["effect_type"]=1, @@ -18233,8 +18586,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack01" }, [30118]={ ["effect_type"]=1, @@ -18257,8 +18609,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack02" }, [30119]={ ["effect_type"]=1, @@ -18281,8 +18632,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30120]={ ["effect_type"]=1, @@ -18305,8 +18655,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack01" }, [30121]={ ["effect_type"]=1, @@ -18329,8 +18678,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack02" }, [30122]={ ["effect_type"]=1, @@ -18353,8 +18701,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30123]={ ["effect_type"]=1, @@ -18383,8 +18730,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack01" }, [30124]={ ["effect_type"]=1, @@ -18413,8 +18759,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack02" }, [30125]={ ["effect_type"]=1, @@ -18443,8 +18788,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30126]={ ["effect_type"]=1, @@ -18467,8 +18811,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack01" }, [30127]={ ["effect_type"]=1, @@ -18491,8 +18834,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack02" }, [30128]={ ["effect_type"]=1, @@ -18515,8 +18857,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30129]={ ["effect_type"]=1, @@ -18545,8 +18886,7 @@ local skill = { ["sound_hit"]={ 1000013 }, - ["name_act"]="attack01", - ["fx_self"]=200142 + ["name_act"]="attack01" }, [30130]={ ["effect_type"]=1, @@ -18575,8 +18915,7 @@ local skill = { ["sound_hit"]={ 1000013 }, - ["name_act"]="attack02", - ["fx_self"]=200143 + ["name_act"]="attack02" }, [30131]={ ["effect_type"]=1, @@ -18605,8 +18944,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30132]={ ["effect_type"]=1, @@ -18635,8 +18973,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack01" }, [30133]={ ["effect_type"]=1, @@ -18665,8 +19002,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack02" }, [30134]={ ["effect_type"]=1, @@ -18695,8 +19031,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30135]={ ["effect_type"]=1, @@ -18725,8 +19060,7 @@ local skill = { ["sound_hit"]={ 1000013 }, - ["name_act"]="attack01", - ["fx_self"]=200142 + ["name_act"]="attack01" }, [30136]={ ["effect_type"]=1, @@ -18755,8 +19089,7 @@ local skill = { ["sound_hit"]={ 1000013 }, - ["name_act"]="attack02", - ["fx_self"]=200143 + ["name_act"]="attack02" }, [30137]={ ["effect_type"]=1, @@ -18785,8 +19118,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30138]={ ["effect_type"]=1, @@ -18815,8 +19147,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack01" }, [30139]={ ["effect_type"]=1, @@ -18845,8 +19176,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack02" }, [30140]={ ["effect_type"]=1, @@ -18875,8 +19205,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30141]={ ["effect_type"]=1, @@ -18905,8 +19234,7 @@ local skill = { ["sound_hit"]={ 1000013 }, - ["name_act"]="attack01", - ["fx_self"]=200142 + ["name_act"]="attack01" }, [30142]={ ["effect_type"]=1, @@ -18935,8 +19263,7 @@ local skill = { ["sound_hit"]={ 1000013 }, - ["name_act"]="attack02", - ["fx_self"]=200143 + ["name_act"]="attack02" }, [30143]={ ["effect_type"]=1, @@ -18965,8 +19292,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [30144]={ ["effect_type"]=1, @@ -18995,8 +19321,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack01" }, [30145]={ ["effect_type"]=1, @@ -19025,8 +19350,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack02" }, [30146]={ ["effect_type"]=1, @@ -19055,8 +19379,7 @@ local skill = { ["sound_hit"]={ 1000014 }, - ["name_act"]="attack03", - ["fx_self"]=200144 + ["name_act"]="attack03" }, [40001]={ ["effect_type"]=1, @@ -23984,6 +24307,6 @@ local skill = { } } local config = { -data=skill,count=884 +data=skill,count=885 } return config \ No newline at end of file diff --git a/lua/app/config/strings/cn/chapter_dungeon_equip.lua b/lua/app/config/strings/cn/chapter_dungeon_equip.lua index 6213097f..85f4ef55 100644 --- a/lua/app/config/strings/cn/chapter_dungeon_equip.lua +++ b/lua/app/config/strings/cn/chapter_dungeon_equip.lua @@ -1,83 +1,83 @@ local chapter_dungeon_equip = { [1]={ ["name"]="邪眸灯灵（第1层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他会使用邪眸制造意念护盾，护盾存在时他将是无敌的。" }, [2]={ ["name"]="诅咒灯灵（第2层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他是一位古代有名的厨师，原本喜欢用美食帮助他人帮助他人，由于爱人的死去让他执着于找寻神灯而被神灯封印。他的美食也变成了邪恶的诅咒。" }, [3]={ ["name"]="黄金灯灵（第3层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他是来自远古的战士，由于探索了黄金财宝而被留在了黄金神灯之中。每一次战斗对他来说都在学习和强化自己，他的攻击只会越来越强。" }, [4]={ - ["name"]="古神灯灵（第4层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["name"]="古医灯灵（第4层）", + ["desc"]="他本有一颗医者之心，为了治疗朋友的不治之症将自己的灵魂出卖给了邪神，残留的意识存在这神灯之中。他的医术能够让自己不断恢复生命。" }, [5]={ ["name"]="霜峰灯灵（第5层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他本是冰雪山峰的部落首领，带领部落人民翻越雪山时遇上了雪崩，不甘的心他成为了霜峰灯灵。在懊悔的岁月里他领悟了冰霜的奥秘。" }, [6]={ ["name"]="邪眸灯灵（第6层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他会使用邪眸制造意念护盾，护盾存在时他将是无敌的。" }, [7]={ ["name"]="诅咒灯灵（第7层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他是一位古代有名的厨师，原本喜欢用美食帮助他人帮助他人，由于爱人的死去让他执着于找寻神灯而被神灯封印。他的美食也变成了邪恶的诅咒。" }, [8]={ ["name"]="黄金灯灵（第8层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他是来自远古的战士，由于探索了黄金财宝而被留在了黄金神灯之中。每一次战斗对他来说都在学习和强化自己，他的攻击只会越来越强。" }, [9]={ - ["name"]="古神灯灵（第9层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["name"]="古医灯灵（第9层）", + ["desc"]="他本有一颗医者之心，为了治疗朋友的不治之症将自己的灵魂出卖给了邪神，残留的意识存在这神灯之中。他的医术能够让自己不断恢复生命。" }, [10]={ ["name"]="霜峰灯灵（第10层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他本是冰雪山峰的部落首领，带领部落人民翻越雪山时遇上了雪崩，不甘的心他成为了霜峰灯灵。在懊悔的岁月里他领悟了冰霜的奥秘。" }, [11]={ ["name"]="邪眸灯灵（第11层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他会使用邪眸制造意念护盾，护盾存在时他将是无敌的。" }, [12]={ ["name"]="诅咒灯灵（第12层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他是一位古代有名的厨师，原本喜欢用美食帮助他人帮助他人，由于爱人的死去让他执着于找寻神灯而被神灯封印。他的美食也变成了邪恶的诅咒。" }, [13]={ ["name"]="黄金灯灵（第13层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他是来自远古的战士，由于探索了黄金财宝而被留在了黄金神灯之中。每一次战斗对他来说都在学习和强化自己，他的攻击只会越来越强。" }, [14]={ - ["name"]="古神灯灵（第14层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["name"]="古医灯灵（第14层）", + ["desc"]="他本有一颗医者之心，为了治疗朋友的不治之症将自己的灵魂出卖给了邪神，残留的意识存在这神灯之中。他的医术能够让自己不断恢复生命。" }, [15]={ ["name"]="霜峰灯灵（第15层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他本是冰雪山峰的部落首领，带领部落人民翻越雪山时遇上了雪崩，不甘的心他成为了霜峰灯灵。在懊悔的岁月里他领悟了冰霜的奥秘。" }, [16]={ ["name"]="邪眸灯灵（第16层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他会使用邪眸制造意念护盾，护盾存在时他将是无敌的。" }, [17]={ ["name"]="诅咒灯灵（第17层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他是一位古代有名的厨师，原本喜欢用美食帮助他人帮助他人，由于爱人的死去让他执着于找寻神灯而被神灯封印。他的美食也变成了邪恶的诅咒。" }, [18]={ ["name"]="黄金灯灵（第18层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他是来自远古的战士，由于探索了黄金财宝而被留在了黄金神灯之中。每一次战斗对他来说都在学习和强化自己，他的攻击只会越来越强。" }, [19]={ - ["name"]="古神灯灵（第19层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["name"]="古医灯灵（第19层）", + ["desc"]="他本有一颗医者之心，为了治疗朋友的不治之症将自己的灵魂出卖给了邪神，残留的意识存在这神灯之中。他的医术能够让自己不断恢复生命。" }, [20]={ ["name"]="霜峰灯灵（第20层）", - ["desc"]="他掌控着拥有魔法能量的邪眸，被远古勇士囚禁在神灯之中。他使用邪眸制造意念护盾，护盾存在时将不受到伤害，每次命中将降低护盾层数，层数为0时护盾消失。" + ["desc"]="他本是冰雪山峰的部落首领，带领部落人民翻越雪山时遇上了雪崩，不甘的心他成为了霜峰灯灵。在懊悔的岁月里他领悟了冰霜的奥秘。" } } local config = { diff --git a/lua/app/config/strings/cn/equip.lua b/lua/app/config/strings/cn/equip.lua index 59990a57..02c7f6b0 100644 --- a/lua/app/config/strings/cn/equip.lua +++ b/lua/app/config/strings/cn/equip.lua @@ -1,4328 +1,378 @@ local equip = { [1200101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [1200102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [1200103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [1200104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [1200105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [1300101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [1300102]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [1300103]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [1300104]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [1300105]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [1300201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [1300202]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [1300203]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [1300204]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [1300205]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [1400101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [1400102]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [1400103]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [1400104]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [1400105]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [1400201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [1400202]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [1400203]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [1400204]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [1400205]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [2200101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [2200102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [2200103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [2200104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [2200105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [2300101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [2300102]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [2300103]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [2300104]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [2300105]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [2300201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [2300202]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [2300203]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [2300204]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [2300205]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [2400101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [2400102]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [2400103]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [2400104]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [2400105]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [2400201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [2400202]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [2400203]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [2400204]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [2400205]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [3200101]={ - ["name"]={ - "[", - "长", - "枪", - ",", - "强", - "力", - "长", - "枪", - ",", - "破", - "甲", - "长", - "枪", - ",", - "不", - "屈", - "长", - "枪", - ",", - "狂", - "风", - "之", - "枪", - ",", - "巨", - "人", - "风", - "暴", - "]" - } + ["name"]="[长枪,强力长枪,破甲长枪,不屈长枪,狂风之枪,巨人风暴]" }, [3200102]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [3200103]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [3200104]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [3200105]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [3300101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [3300102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [3300103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [3300104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [3300105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [3300201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [3300202]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [3300203]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [3300204]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [3300205]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [3400101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [3400102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [3400103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [3400104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [3400105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [3400201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [3400202]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="[粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠]" }, [3400203]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="[厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠]" }, [3400204]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="[粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链]" }, [3400205]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="[粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮]" }, [4200101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [4200102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [4200103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [4200104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [4200105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [4300101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [4300102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [4300103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [4300104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [4300105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [4300201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [4300202]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [4300203]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [4300204]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [4300205]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [4400101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [4400102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="[凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠]" }, [4400103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="[软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍]" }, [4400104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="[简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索]" }, [4400105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="[粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲]" }, [4400201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="[舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇]" }, [4400202]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠" }, [4400203]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍" }, [4400204]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索" }, [4400205]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲" }, [5200101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇" }, [5200102]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠" }, [5200103]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠" }, [5200104]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链" }, [5200105]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" }, [5300101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇" }, [5300102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠" }, [5300103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍" }, [5300104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索" }, [5300105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲" }, [5300201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇" }, [5300202]={ - ["name"]={ - "[", - "粗", - "钢", - "面", - "甲", - ",", - "精", - "钢", - "面", - "盔", - ",", - "黑", - "曜", - "贵", - "冠", - ",", - "英", - "勇", - "冠", - "冕", - ",", - "龙", - "角", - "之", - "冠", - ",", - "永", - "恒", - "华", - "冠", - "]" - } + ["name"]="粗钢面甲,精钢面盔,黑曜贵冠,英勇冠冕,龙角之冠,永恒华冠" }, [5300203]={ - ["name"]={ - "[", - "厚", - "织", - "长", - "衫", - ",", - "薄", - "钢", - "环", - "甲", - ",", - "玄", - "铁", - "重", - "甲", - ",", - "强", - "者", - "玉", - "甲", - ",", - "龙", - "鳞", - "金", - "胄", - ",", - "永", - "恒", - "重", - "铠", - "]" - } + ["name"]="厚织长衫,薄钢环甲,玄铁重甲,强者玉甲,龙鳞金胄,永恒重铠" }, [5300204]={ - ["name"]={ - "[", - "粗", - "布", - "腰", - "带", - ",", - "皮", - "革", - "腰", - "带", - ",", - "乌", - "金", - "束", - "腰", - ",", - "骑", - "士", - "腰", - "环", - ",", - "龙", - "筋", - "束", - "腰", - ",", - "永", - "恒", - "腰", - "链", - "]" - } + ["name"]="粗布腰带,皮革腰带,乌金束腰,骑士腰环,龙筋束腰,永恒腰链" }, [5300205]={ - ["name"]={ - "[", - "粗", - "布", - "护", - "手", - ",", - "皮", - "革", - "腕", - "带", - ",", - "铁", - "心", - "腕", - "带", - ",", - "英", - "雄", - "护", - "手", - ",", - "龙", - "须", - "护", - "腕", - ",", - "永", - "恒", - "腕", - "轮", - "]" - } + ["name"]="粗布护手,皮革腕带,铁心腕带,英雄护手,龙须护腕,永恒腕轮" }, [5400101]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇" }, [5400102]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠" }, [5400103]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍" }, [5400104]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索" }, [5400105]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲" }, [5400201]={ - ["name"]={ - "[", - "舞", - "扇", - ",", - "律", - "动", - "舞", - "扇", - ",", - "红", - "莲", - "舞", - "扇", - ",", - "金", - "雀", - "舞", - "扇", - ",", - "金", - "焰", - "姿", - "扇", - ",", - "炫", - "彩", - "舞", - "扇", - "]" - } + ["name"]="舞扇,律动舞扇,红莲舞扇,金雀舞扇,金焰姿扇,炫彩舞扇" }, [5400202]={ - ["name"]={ - "[", - "凡", - "花", - "木", - "簪", - ",", - "珍", - "珠", - "簪", - "饰", - ",", - "火", - "纹", - "金", - "钗", - ",", - "皎", - "月", - "玉", - "簪", - ",", - "凤", - "冠", - "星", - "簪", - ",", - "至", - "尊", - "魅", - "冠", - "]" - } + ["name"]="凡花木簪,珍珠簪饰,火纹金钗,皎月玉簪,凤冠星簪,至尊魅冠" }, [5400203]={ - ["name"]={ - "[", - "软", - "革", - "里", - "衣", - ",", - "缀", - "玉", - "长", - "袍", - ",", - "紫", - "纱", - "绸", - "缎", - ",", - "琥", - "珀", - "彩", - "衣", - ",", - "凤", - "羽", - "华", - "装", - ",", - "至", - "尊", - "星", - "袍", - "]" - } + ["name"]="软革里衣,缀玉长袍,紫纱绸缎,琥珀彩衣,凤羽华装,至尊星袍" }, [5400204]={ - ["name"]={ - "[", - "简", - "约", - "绣", - "带", - ",", - "优", - "雅", - "束", - "腰", - ",", - "珍", - "珠", - "绣", - "带", - ",", - "星", - "光", - "御", - "带", - ",", - "凤", - "眸", - "束", - "带", - ",", - "至", - "尊", - "仙", - "索", - "]" - } + ["name"]="简约绣带,优雅束腰,珍珠绣带,星光御带,凤眸束带,至尊仙索" }, [5400205]={ - ["name"]={ - "[", - "粗", - "丝", - "手", - "套", - ",", - "轻", - "纱", - "护", - "手", - ",", - "黄", - "金", - "华", - "护", - ",", - "星", - "辰", - "护", - "手", - ",", - "凤", - "骨", - "护", - "手", - ",", - "至", - "尊", - "手", - "甲", - "]" - } + ["name"]="粗丝手套,轻纱护手,黄金华护,星辰护手,凤骨护手,至尊手甲" } } local config = { diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index e3fc0efd..172e80ea 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -391,11 +391,13 @@ local localization_global = ["ATTR_NORMAL_HURTP"] = "普攻增伤%", ["ATTR_SKILL_HURTP"] = "技能增伤%", ["ATTR_CURED"] = "治疗效果提升%", - - ["DUNGEON_WEAPON_DESC_12"] = "最近没有通关", ["DUNGEON_WEAPON_DESC_13"] = "今日扫荡次数已用完", ["DUNGEON_WEAPON_DESC_14"] = "查看", + ["MOP_UP_DESC_1"] = "扫荡完成", + ["MOP_UP_DESC_2"] = "再次扫荡", + + ["DUNGEON_WEAPON_DESC_15"] = "最强灯神阵容", } return localization_global \ No newline at end of file diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index f9708088..e3afe10e 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -86,6 +86,8 @@ BattleConst.BATTLE_TYPE = { DUNGEON_GOLD = "3", DUNGEON_SHARDS = "4", ARENA = "5", + DUNGEON_WEAPON = "6", + DUNGEON_ARMOR = "7", } BattleConst.IS_PVP_BATTLE = { diff --git a/lua/app/module/battle/battle_manager.lua b/lua/app/module/battle/battle_manager.lua index 225582f2..7cc2b3ac 100644 --- a/lua/app/module/battle/battle_manager.lua +++ b/lua/app/module/battle/battle_manager.lua @@ -11,7 +11,9 @@ local BATTLE_CONTROLLER = { [BattleConst.BATTLE_TYPE.DAILY_CHALLENGE] = "app/module/battle/controller/battle_controller_daily_challenge", [BattleConst.BATTLE_TYPE.DUNGEON_GOLD] = "app/module/battle/controller/battle_controller_dungeon_gold", [BattleConst.BATTLE_TYPE.DUNGEON_SHARDS] = "app/module/battle/controller/battle_controller_dungeon_shards", - [BattleConst.BATTLE_TYPE.ARENA] = "app/module/battle/controller/battle_controller_arena" + [BattleConst.BATTLE_TYPE.ARENA] = "app/module/battle/controller/battle_controller_arena", + [BattleConst.BATTLE_TYPE.DUNGEON_WEAPON] = "app/module/battle/controller/battle_controller_dungeon_weapon", + [BattleConst.BATTLE_TYPE.DUNGEON_ARMOR] = "app/module/battle/controller/battle_controller_dungeon_armor", } function BattleManager:showPauseUI(battleType, battleController) @@ -22,7 +24,7 @@ function BattleManager:showPauseUI(battleType, battleController) end end -function BattleManager:showBattleResultUI(battleType, rewards, combatReport, mysteryBoxIdx) +function BattleManager:showBattleResultUI(battleType, rewards, combatReport, mysteryBoxIdx, firstPassIdx, noMergeReward) UIManager:showUI("app/ui/battle/battle_result_ui", { battleType = battleType, isWin = combatReport.victory, @@ -30,7 +32,9 @@ function BattleManager:showBattleResultUI(battleType, rewards, combatReport, mys atkReport = combatReport.atkReport, wave = combatReport.wave, mysteryBoxIdx = mysteryBoxIdx or 0, + firstPassIdx = firstPassIdx or 0, remainRound = combatReport.remainRound or 0, + noMergeReward = noMergeReward, }) end diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua b/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua new file mode 100644 index 00000000..c807d108 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua @@ -0,0 +1,77 @@ +local BattleController = require "app/module/battle/controller/battle_controller" +local BattleControllerDungeonWeapon = class("BattleControllerDungeonWeapon", BattleController) + +function BattleControllerDungeonWeapon:getBoardConfig() + return ConfigManager:getConfig("chapter_board_dungeon_equip") +end + +function BattleControllerDungeonWeapon:getChapterConfig() + return ConfigManager:getConfig("chapter_dungeon_equip") +end + +function BattleControllerDungeonWeapon:getChapterId() + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + return weaponData:getCurFightChapterId() +end + +function BattleControllerDungeonWeapon:controllBattleEnd() + self.combatReport = { + battleType = GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, + wave = self.waveIndex, + victory = self.victory, + } + local atkReport = {} + local teamEntity = self.battleData:getAtkTeam() + local members = teamEntity:getAllMembers() + for k, v in pairs(members) do + local report = { + heroId = v:getId(), + dmg = v:getDamageCount(), + } + table.insert(atkReport, report) + end + self.combatReport.atkReport = atkReport + if not self.victory then + self.combatReport.wave = self.combatReport.wave - 1 + end + ModuleManager.DungeonWeaponManager:reqEndChallenge(self.chapterId, self.combatReport, self.taskProgress) +end + +function BattleControllerDungeonWeapon:postWaveOver(atkDead, isQuit) + local deathType = BIReport.FIGHT_DEATH_TYPE.SURVIVE + local waveEndType = BIReport.FIGHT_WAVE_END_TYPE.WIN + if atkDead then + if self.isBossWave then + deathType = BIReport.FIGHT_DEATH_TYPE.BOSS_FAIL + else + deathType = BIReport.FIGHT_DEATH_TYPE.NORMAL_FAIL + end + waveEndType = BIReport.FIGHT_WAVE_END_TYPE.FAIL + end + + if isQuit then + waveEndType = BIReport.FIGHT_WAVE_END_TYPE.QUIT + end + + local duration = self.waveDurationTime + local totalTime = self.totalDurationTime + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + local startTimes = weaponData:getChapterFightCount(self.chapterId) + local isFirstWin = false + if weaponData:getPassedMaxId() < self.chapterId and self.victory then + isFirstWin = true + end + + local isFianlStep = self.waveIndex >= self.maxWaveIndex + + BIReport:postFightEnd(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, self.battleData, self.chapterId, self.waveIndex, duration, totalTime, self.eliminateCount, self.eliminateTotalCount, waveEndType, deathType, startTimes, isFirstWin, isFianlStep, self.maxLinkCount) +end + +function BattleControllerDungeonWeapon:postFightStart() + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + local startTimes = weaponData:getChapterFightCount(self.chapterId) + local unlockMaxChapter = weaponData:getPassedMaxId() + 1 + BIReport:postFightBegin(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, self.waveIndex, self.chapterId, unlockMaxChapter, startTimes) +end + +return BattleControllerDungeonWeapon \ No newline at end of file diff --git a/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua.meta b/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua.meta new file mode 100644 index 00000000..c5c787d8 --- /dev/null +++ b/lua/app/module/battle/controller/battle_controller_dungeon_weapon.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c4928c1be06af084082b9ea721afed69 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/module/common.meta b/lua/app/module/common.meta new file mode 100644 index 00000000..8ea3e412 --- /dev/null +++ b/lua/app/module/common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 17207e19052e6f542b794c7243f97a02 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/lua/app/common/common_manager.lua b/lua/app/module/common/common_manager.lua similarity index 75% rename from lua/app/common/common_manager.lua rename to lua/app/module/common/common_manager.lua index 66b5a688..92b789d4 100644 --- a/lua/app/common/common_manager.lua +++ b/lua/app/module/common/common_manager.lua @@ -15,4 +15,11 @@ function CommonManager:showMopUpUI(rewards, remainCount, callback, customtitleTx UIManager:showUI("app/ui/common/mop_up_ui", params) end +function CommonManager:showFormationUI(formationType) + local params = { + formationType = formationType + } + UIManager:showUI("app/ui/common/common_formation_ui", params) +end + return CommonManager \ No newline at end of file diff --git a/lua/app/common/common_manager.lua.meta b/lua/app/module/common/common_manager.lua.meta similarity index 86% rename from lua/app/common/common_manager.lua.meta rename to lua/app/module/common/common_manager.lua.meta index 95be7962..12c68ca9 100644 --- a/lua/app/common/common_manager.lua.meta +++ b/lua/app/module/common/common_manager.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 67801c6593529c84d8b2f218d5c629a6 +guid: f232addf6c4152a42ab0c464183a206f ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua b/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua index c29a5893..73db0923 100644 --- a/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua +++ b/lua/app/module/dungeon_weapon/dungeon_weapon_manager.lua @@ -5,7 +5,141 @@ function DungeonWeaponManager:showMainUI() end function DungeonWeaponManager:showIntroductionUI(chapterId) + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + local passInfo = weaponData:getCachePassInfo(chapterId) + if not passInfo then + self:reqPassInfo(chapterId) + end UIManager:showUI("app/ui/dungeon_weapon/dungeon_weapon_introduction_ui", {chapterId = chapterId}) end +function DungeonWeaponManager:reqFight(chapterId) + if not DataManager.FormationData:formationIsFull(GConst.BattleConst.FORMATION_TYPE.DUNGEON_WEAPON) then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.BATTLE_DESC_8)) + return + end + + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + if not weaponData:canFightChapter(chapterId) then + return + end + + local heroes = {} + local formation = DataManager.FormationData:getDungeonWeaponFormation() + for matchType, heroId in pairs(formation) do + if heroId > 0 then + table.insert(heroes, heroId) + end + end + local parmas = {chapter_weapon_id = chapterId, heroes = heroes} + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterWeaponChallengeStartReq, parmas, {}, self.rsqFight, BIReport.ITEM_GET_TYPE.DUNGEON_WEAPON_CHALLENGE) +end + +function DungeonWeaponManager:rsqFight(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + weaponData:setCurFightChapterId(result.reqData.chapter_weapon_id) + local params = { + atkFormation = {} + } + local formation = DataManager.FormationData:getDungeonWeaponFormation() + for elementType, heroId in pairs(formation) do + local heroEntity = DataManager.HeroData:getHeroById(heroId) + if heroEntity then + params.atkFormation[elementType] = heroEntity + end + end + ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, params, function() + self:showMainUI() + end) + end +end + +function DungeonWeaponManager:reqEndChallenge(chapterId, combatReport, taskProgress) + local parmas = { + chapter_weapon_id = chapterId, + win = combatReport.victory, + task_stat = taskProgress, + combatReport = combatReport, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterWeaponChallengeSettlementReq, parmas, {}, self.rsqEndChallenge, BIReport.ITEM_GET_TYPE.DUNGEON_WEAPON_END) +end + +function DungeonWeaponManager:rsqEndChallenge(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + weaponData:refreshInfoOnSettlement(result.reqData.chapter_weapon_id, result) + + local firstRewardsIdx = #result.first_rewards + local rewardCount = #result.rewards + if firstRewardsIdx > rewardCount then + firstRewardsIdx = rewardCount + end + local rewards = {} + for i = firstRewardsIdx + 1, rewardCount do + table.insert(rewards, result.rewards[i]) + end + local newRewards = {} + GFunc.mergeRewards2(rewards, newRewards) + local resultRewards = {} + for i = 1, firstRewardsIdx do + table.insert(resultRewards, result.rewards[i]) + end + for _, reward in ipairs(newRewards) do + table.insert(resultRewards, reward) + end + ModuleManager.BattleManager:showBattleResultUI(GConst.BattleConst.BATTLE_TYPE.DUNGEON_WEAPON, resultRewards, result.reqData.combatReport, nil, firstRewardsIdx, true) + end +end + +-- 请求扫荡副本 +function DungeonWeaponManager:reqSweep(chapterId) + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + + -- 判断次数 + if weaponData:getRemianFarmCount() <= 0 then + GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_13)) + return + end + + if not weaponData:canFarmChapter(chapterId) then + return + end + + local parmas = { + chapter_weapon_id = chapterId, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterWeaponChallengeFarmReq, parmas, {}, self.respSweep, BIReport.ITEM_GET_TYPE.DUNGEON_WEAPON_SWEEP) +end + +-- 响应扫荡副本 +function DungeonWeaponManager:respSweep(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + weaponData:refreshInfoOnFarm(result) + + local remainCount = weaponData:getRemianFarmCount() + -- 合并奖励 + local newRewards = {} + GFunc.mergeRewards2(result.rewards, newRewards) + ModuleManager.CommonManager:showMopUpUI(newRewards, remainCount, function() + self:reqSweep(result.reqData.chapter_weapon_id) + end) + end +end + +function DungeonWeaponManager:reqPassInfo(chapterId) + local parmas = { + chapter_weapon_id = chapterId, + } + self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterWeaponLatestPlayerInfoReq, parmas, {}, self.rspPassInfo) +end + +function DungeonWeaponManager:rspPassInfo(result) + if result.err_code == GConst.ERROR_STR.SUCCESS then + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + weaponData:doCachePassInfo(result.reqData.chapter_weapon_id, result.players) + end +end + return DungeonWeaponManager \ No newline at end of file diff --git a/lua/app/ui/battle/battle_result_ui.lua b/lua/app/ui/battle/battle_result_ui.lua index 1c765c1e..d2aab353 100644 --- a/lua/app/ui/battle/battle_result_ui.lua +++ b/lua/app/ui/battle/battle_result_ui.lua @@ -16,6 +16,9 @@ function BattleResultUI:ctor(params) self.battleType = params.battleType self.isWin = params.isWin self.rewards = params.rewards + self.firstPassIdx = params.firstPassIdx or 0 + self.noMergeReward = params.noMergeReward + -- pve特有 self.atkReport = params.atkReport self.wave = params.wave @@ -35,14 +38,10 @@ function BattleResultUI:ctor(params) end end - -- 相同奖励合并 - for idx, reward in pairs(self.rewards) do - for i = #self.rewards, idx + 1, -1 do - if i ~= idx and reward.item.id == self.rewards[i].item.id then - reward.item.count = reward.item.count + self.rewards[i].item.count - table.remove(self.rewards, i) - end - end + if not self.noMergeReward then + local newRewards = {} + GFunc.mergeRewards2(self.rewards, newRewards) + self.rewards = newRewards end end @@ -360,6 +359,7 @@ function BattleResultUI:refreshRewards() self.animRewards[index] = self:showRewardAppearAnim(index, cell) end cell:showRightUpIcon(index <= self.mysteryBoxIdx, GConst.ATLAS_PATH.COMMON, "common_chest_1") + cell:showFirstPass(index <= self.firstPassIdx) end) if self:hasArenaBoxNode() then self.rewardScrollRect:setSizeDeltaY(SCROLL_LINE_HEIGHT) diff --git a/lua/app/ui/common/common_formation_ui.lua b/lua/app/ui/common/common_formation_ui.lua new file mode 100644 index 00000000..75a87217 --- /dev/null +++ b/lua/app/ui/common/common_formation_ui.lua @@ -0,0 +1,56 @@ +local CommonFormationUI = class("CommonFormationUI", BaseUI) + +function CommonFormationUI:showCommonBG() + return false +end + +function CommonFormationUI:getPrefabPath() + return "assets/prefabs/ui/common/common_formation_ui.prefab" +end + +function CommonFormationUI:getCurrencyParams() + if self.currencyParams == nil then + self.currencyParams = { + itemIds = { + GConst.ItemConst.ITEM_ID_GEM, + }, + showType = GConst.CURRENCY_TYPE.HORIZONTAL + } + end + + return self.currencyParams +end + +function CommonFormationUI:ctor(params) + self.formationType = params.formationType +end + +function CommonFormationUI:onLoadRootComplete() + local uiMap = self.root:genAllChildren() + + uiMap["common_formation_ui.banner.btn_ok.tx_ok"]:setText(I18N:getGlobalText(I18N.GlobalConst.ARENA_DESC_24)) + uiMap["common_formation_ui.banner.btn_ok"]:addClickListener(function() + self:closeUI() + end) + + local heroUI = uiMap["common_formation_ui.hero_ui"] + heroUI:initPrefabHelper() + heroUI:genAllChildren() + self.heroComp = heroUI:addLuaComponent("app/ui/hero/hero_comp") + + self:bind(DataManager.HeroData, "isDirty", function() + self:onRefresh() + end) + self:bind(DataManager.BagData.ItemData, "dirty", function() + self:onRefresh() + end) + self:addEventListener(EventManager.CUSTOM_EVENT.GO_SHOP, function() + self:closeUI() + end) +end + +function CommonFormationUI:onRefresh() + self.heroComp:refresh(self.formationType) +end + +return CommonFormationUI \ No newline at end of file diff --git a/lua/app/ui/common/common_formation_ui.lua.meta b/lua/app/ui/common/common_formation_ui.lua.meta new file mode 100644 index 00000000..afa16a7f --- /dev/null +++ b/lua/app/ui/common/common_formation_ui.lua.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a827eeea98715174b8206cb56f3cb4f4 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 3b8b241bab4a4ac9a22fcce9c64f1242, type: 3} diff --git a/lua/app/ui/dungeon/dungeon_board_cell.lua b/lua/app/ui/dungeon/dungeon_board_cell.lua index b0b35973..966436ea 100644 --- a/lua/app/ui/dungeon/dungeon_board_cell.lua +++ b/lua/app/ui/dungeon/dungeon_board_cell.lua @@ -53,14 +53,27 @@ function DungeonBoardCell:refreshInfo() self.txOpen:setAnchoredPositionY(-110) self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC)) - local time = DataManager.DungeonData:getRemainTimes(self.moduleKey) - local timeStr = nil - if time <= 0 then - timeStr = "" .. time .. "" + if self.moduleKey == ModuleManager.MODULE_KEY.DUNGEON_WEAPON then + local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) + local time = weaponData:getRemianFarmCount() + local timeStr = nil + if time <= 0 then + timeStr = "" .. time .. "" + else + timeStr = time + end + self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_5, timeStr)) else - timeStr = time + local time = DataManager.DungeonData:getRemainTimes(self.moduleKey) + local timeStr = nil + if time <= 0 then + timeStr = "" .. time .. "" + else + timeStr = time + end + self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) end - self.txTimes:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timeStr)) + self:refreshCountdown(self.txCountdown) else self.btnStart:setVisible(false) @@ -71,15 +84,19 @@ function DungeonBoardCell:refreshInfo() self.lockTxLock:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_OPEN)) self:refreshCountdown(self.lockTxCountdown) end - self.txTimes:setVisible(not DataManager.DungeonData:isNoTotalLimit(self.moduleKey)) GFunc.centerImgAndTx(self.lockIcon, self.lockTxLock, 10) GFunc.centerImgAndTx(self.lockIconCountdown, self.lockTxCountdown, 10) end function DungeonBoardCell:refreshRewards() - local id = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey) - self.itemReward:refreshItemById(id, 0) + if self.moduleKey == ModuleManager.MODULE_KEY.DUNGEON_WEAPON then + self.itemReward:getBaseObject():setActive(false) + else + self.itemReward:getBaseObject():setActive(true) + local id = DataManager.DungeonData:getBoardShowRewardId(self.moduleKey) + self.itemReward:refreshItemById(id, 0) + end end function DungeonBoardCell:refreshCountdown(txCountdown) diff --git a/lua/app/ui/dungeon_weapon/cell/chapter_layer_cell.lua b/lua/app/ui/dungeon_weapon/cell/chapter_layer_cell.lua index 2c1d5208..8de2f4e0 100644 --- a/lua/app/ui/dungeon_weapon/cell/chapter_layer_cell.lua +++ b/lua/app/ui/dungeon_weapon/cell/chapter_layer_cell.lua @@ -41,14 +41,12 @@ function ChapterLayerCell:refresh(id) fightBtn:setSprite(GConst.ATLAS_PATH.COMMON, FIGHT_BTN[2]) fightDesc:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH)) - self.rewardCells[1]:refreshByConfig(config.must_drop[1]) - self.rewardCells[2]:refreshByConfig(config.rand_drop[1]) - self.rewardCells[3]:refreshByConfig(config.rand_drop[2]) for i = 1, 3 do + self.rewardCells[i]:refreshByConfig(config.item_show[i]) self.rewardCells[i]:hideCountTx() end fightBtn:addClickListener(function() - Logger.logHighlight("扫荡") + ModuleManager.DungeonWeaponManager:reqSweep(id) end) elseif weaponData:canFightChapter(id) then -- 可挑战 mask:setVisible(false) @@ -60,16 +58,14 @@ function ChapterLayerCell:refresh(id) fightBtn:setSprite(GConst.ATLAS_PATH.COMMON, FIGHT_BTN[1]) fightDesc:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE)) - self.rewardCells[1]:refreshByConfig(config.must_drop[1]) - self.rewardCells[2]:refreshByConfig(config.rand_drop[1]) - self.rewardCells[3]:refreshByConfig(config.rand_drop[2]) for i = 1, 3 do + self.rewardCells[i]:refreshByConfig(config.item_show[i]) self.rewardCells[i]:hideCountTx() end self.rewardCells[4]:refreshByConfig(config.first_reward) self.rewardCells[4]:showFirstPass(true) fightBtn:addClickListener(function() - Logger.logHighlight("挑战") + ModuleManager.DungeonWeaponManager:reqFight(id) end) else -- 不可挑战 mask:setVisible(true) diff --git a/lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua b/lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua index 515d9aa2..4020349a 100644 --- a/lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua +++ b/lua/app/ui/dungeon_weapon/dungeon_weapon_main_ui.lua @@ -18,17 +18,18 @@ function DungeonWeaponMainUI:getPrefabPath() end function DungeonWeaponMainUI:ctor() + self.weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) self.chapterList = {} - self.targetId = nil + self.targetId = self.weaponData:getPassedMaxId() for id, info in pairs(ConfigManager:getConfig("chapter_dungeon_equip")) do table.insert(self.chapterList, id) if not self.targetId then self.targetId = id end - -- if id == then -- 最大可挑战章节 - -- self.targetId = id - -- end + if id == self.weaponData:getPassedMaxId() + 1 and self.weaponData:canFightChapter(id) then -- 最大可挑战章节 + self.targetId = id + end end end @@ -52,10 +53,25 @@ function DungeonWeaponMainUI:_addListeners() uiMap["dungeon_weapon_mian_ui.banner.btn_back"]:addClickListener(function() self:closeUI() end) + + uiMap["dungeon_weapon_mian_ui.banner.btn_formation"]:addClickListener(function() + ModuleManager.CommonManager:showFormationUI(GConst.BattleConst.FORMATION_TYPE.DUNGEON_WEAPON) + end) end function DungeonWeaponMainUI:_bind() + self:bind(self.weaponData, "isDirty", function() + self:refreshFormation() + self:refreshRemianNode() + end) + self:bind(DataManager.FormationData, "dirty", function() + self:refreshFormation() + end) + + self:bind(DataManager.FormationData, "isDirty", function() + self:refreshFormation() + end) end function DungeonWeaponMainUI:refreshScrollrect() @@ -84,8 +100,7 @@ function DungeonWeaponMainUI:refreshRemianNode() local uiMap = self.root:genAllChildren() local node = uiMap["dungeon_weapon_mian_ui.remian_node"] local txt = uiMap["dungeon_weapon_mian_ui.remian_node.desc"] - local weaponData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_WEAPON) - txt:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_5, weaponData:getRemianFarmCount() .. "/" .. weaponData:getDialyFarmLimit())) + txt:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_5, self.weaponData:getRemianFarmCount() .. "/" .. self.weaponData:getDialyFarmLimit())) GFunc.expandImgToFitTx(node, txt, 16.5) end diff --git a/lua/app/ui/hero/hero_comp.lua b/lua/app/ui/hero/hero_comp.lua index cd0c0bcc..f56a5e33 100644 --- a/lua/app/ui/hero/hero_comp.lua +++ b/lua/app/ui/hero/hero_comp.lua @@ -91,6 +91,8 @@ function HeroComp:refresh(battleType) self:refreshArenaFightFormation() elseif self.battleType == GConst.BattleConst.FORMATION_TYPE.ARENA_DEFEND then self:refreshArenaDefendFormation() + elseif self.battleType == GConst.BattleConst.FORMATION_TYPE.DUNGEON_WEAPON then + self:refreshDungeonWeaponFormation() end end @@ -135,6 +137,20 @@ function HeroComp:refreshArenaDefendFormation() self:refreshScrollRect() end +-- 展示武器副本 +function HeroComp:refreshDungeonWeaponFormation() + self.txTitle:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_WEAPON_DESC_15)) + self.rimgTopBG:setTexture("assets/arts/textures/background/hero/hero_bg_1.png") + self.curFormation = DataManager.FormationData:getDungeonWeaponFormation() + + self.onClickUseFunc = function(id, type) + DataManager.FormationData:upHeroToFormation(self.battleType, type, id) + self:refreshDungeonWeaponFormation() + end + + self:refreshScrollRect() +end + function HeroComp:refreshScrollRect() for i = 1, 5 do local heroId = self.curFormation[i] diff --git a/lua/app/ui/main_city/component/dungeon_comp.lua b/lua/app/ui/main_city/component/dungeon_comp.lua index bb755a09..74c85f10 100644 --- a/lua/app/ui/main_city/component/dungeon_comp.lua +++ b/lua/app/ui/main_city/component/dungeon_comp.lua @@ -25,7 +25,7 @@ function DungeonComp:init() return "app/ui/dungeon/dungeon_board_cell" end) self.scrollRectComp:addRefreshCallback(function(index, cell) - cell:refresh(self.openDungeons[index]) + cell:refresh(self.openDungeons[index].module) end) self.scrollRectComp:setTotalCount(0) self:refreshShow() diff --git a/lua/app/ui/tips/base_tips.lua b/lua/app/ui/tips/base_tips.lua index 17348c7d..a3f993d0 100644 --- a/lua/app/ui/tips/base_tips.lua +++ b/lua/app/ui/tips/base_tips.lua @@ -116,7 +116,7 @@ function BaseTips:adaptWhenOverScreen(node, pivotX, pivotY) -- 右边超出屏幕 if math.abs(rightX) > halfWidth then node:addAnchoredPosition(halfWidth - math.abs(rightX), 0) - xOffset = xOffset + math.abs(leftX) - halfWidth + xOffset = xOffset + halfWidth - math.abs(rightX) end -- 上边超出屏幕 if math.abs(topY) > halfHeight then diff --git a/lua/app/userdata/dungeon/dungeon_data.lua b/lua/app/userdata/dungeon/dungeon_data.lua index 2d5cb87d..eef8c632 100644 --- a/lua/app/userdata/dungeon/dungeon_data.lua +++ b/lua/app/userdata/dungeon/dungeon_data.lua @@ -1,7 +1,10 @@ local DungeonData = class("DungeonData", BaseData) local SORT_ORDER = { - + [ModuleManager.MODULE_KEY.DUNGEON_GOLD] = 1, + [ModuleManager.MODULE_KEY.DUNGEON_SHARDS] = 2, + [ModuleManager.MODULE_KEY.DUNGEON_WEAPON] = 3, + [ModuleManager.MODULE_KEY.DUNGEON_ARMOR] = 4, } -- 所有活动副本数据 @@ -11,6 +14,11 @@ function DungeonData:ctor() end function DungeonData:clear() + if self.dataDungeons then + for _, entity in pairs(self.dataDungeons) do + entity:clear() + end + end end -- 初始化金币副本数据 @@ -167,35 +175,33 @@ function DungeonData:getOpenDungeons() -- 开启且活跃 table.foreach(self.dungeonStage, function(module, s) if self:isOpen(module) and self:isActive(module) then - table.insert(openDungeons, module) + local count = self:getRemainTimes(module) + if count > 0 then + count = 100 + else + count = 200 + end + table.insert(openDungeons, { + sort = SORT_ORDER[module] + 1000 + count, -- 系数 + 开启1000 + 剩余次数 + module = module + }) end end) -- 开启且不活跃 if not GFunc.isShenhe() then table.foreach(self.dungeonStage, function(module, s) if self:isOpen(module) and not self:isActive(module) then - table.insert(openDungeons, module) + table.insert(openDungeons, { + sort = SORT_ORDER[module] + 2000, -- 系数 + 未开启2000 + module = module + }) end end) end - -- 碎片和金币顺序特殊处理：策划要求，同时开启时，金币在碎片之上 - if self:isActive(ModuleManager.MODULE_KEY.DUNGEON_GOLD) and self:isActive(ModuleManager.MODULE_KEY.DUNGEON_SHARDS) then - local idxGold,idxShards = 0,0 - for idx, module in pairs(openDungeons) do - if module == ModuleManager.MODULE_KEY.DUNGEON_GOLD then - idxGold = idx - end - if module == ModuleManager.MODULE_KEY.DUNGEON_SHARDS then - idxShards = idx - end - end - if idxGold > idxShards then - local temp = openDungeons[idxShards] - openDungeons[idxShards] = openDungeons[idxGold] - openDungeons[idxGold] = temp - end - end + table.sort(openDungeons, function(a, b) + return a.sort < b.sort + end) if EDITOR_MODE then Logger.logHighlight("已开启副本:") diff --git a/lua/app/userdata/dungeon/dungeon_weapon_entity.lua b/lua/app/userdata/dungeon/dungeon_weapon_entity.lua index 8e1a2d27..b69a0ae8 100644 --- a/lua/app/userdata/dungeon/dungeon_weapon_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_weapon_entity.lua @@ -4,13 +4,37 @@ local DungeonWeaponEntity = class("DungeonWeaponEntity", DungeonBaseEntity) local GET_PASS_INFO_INTERVAL = 600 -- 支线副本数据 +function DungeonWeaponEntity:clear() + DataManager:unregisterCrossDayFunc("DungeonWeaponEntity") +end + function DungeonWeaponEntity:init(data) - self.maxPassedId = data.max_challenge_id - self.farmCount = data.farm_count - self.heroes = data.heroes - self.giftInfo = data.gift_info - self.totalChallengeCount = data.total_challenge_count + self.maxPassedId = data.max_challenge_id or 0 + self.farmCount = data.farm_count or 0 + self.heroes = data.heroes or {} + self.giftInfo = data.gift_info or {} + self.totalChallengeCount = data.total_challenge_count or {} self.data.isDirty = not self.data.isDirty + + DataManager.FormationData:initDungeonWeapon(self.heroes) + + DataManager:registerCrossDayFunc("DungeonWeaponEntity", function() + self.farmCount = 0 + self:setDirty() + end) +end + +function DungeonWeaponEntity:refreshInfoOnSettlement(chapterId, result) + self.totalChallengeCount[chapterId] = (self.totalChallengeCount[chapterId] or 0) + 1 + self.maxPassedId = result.max_id + self.giftInfo = result.gift_info + self:setDirty() +end + +function DungeonWeaponEntity:refreshInfoOnFarm(result) + self.farmCount = self.farmCount + 1 + self.giftInfo = result.gift_info + self:setDirty() end function DungeonWeaponEntity:setDirty() @@ -18,7 +42,11 @@ function DungeonWeaponEntity:setDirty() end function DungeonWeaponEntity:getTotalChallengeCount() - return self.totalChallengeCount + local count = 0 + for _, c in pairs(self.totalChallengeCount) do + count = count + 1 + end + return count end function DungeonWeaponEntity:getTodayChallengeCount() @@ -89,6 +117,10 @@ function DungeonWeaponEntity:getRemianFarmCount() return count end +function DungeonWeaponEntity:getTodayRemainLimitCount() + return self:getRemianFarmCount() +end + function DungeonWeaponEntity:getLevelEnough(chapterId) local config = ConfigManager:getConfig(self:getConfigName())[chapterId] if not config then @@ -139,6 +171,7 @@ function DungeonWeaponEntity:doCachePassInfo(chapterId, info) self.cachePassInfo[chapterId].info = info self.cachePassInfo[chapterId].getTime = Time:getServerTime() end + self:setDirty() end function DungeonBaseEntity:getCachePassInfo(chapterId) @@ -157,4 +190,16 @@ function DungeonBaseEntity:getCachePassInfo(chapterId) return self.cachePassInfo[chapterId].info end +function DungeonWeaponEntity:setCurFightChapterId(chapterId) + self.curFightchapterId = chapterId or 1 +end + +function DungeonWeaponEntity:getCurFightChapterId() + return self.curFightchapterId or 1 +end + +function DungeonWeaponEntity:getChapterFightCount(chapterId) + return self.totalChallengeCount[chapterId] or 0 +end + return DungeonWeaponEntity \ No newline at end of file diff --git a/lua/app/userdata/formation/formation_data.lua b/lua/app/userdata/formation/formation_data.lua index 2d0778a0..f0b88662 100644 --- a/lua/app/userdata/formation/formation_data.lua +++ b/lua/app/userdata/formation/formation_data.lua @@ -46,6 +46,20 @@ function FormationData:initArena(attack, defend) self:setDirty() end +function FormationData:initDungeonWeapon(heroes) + if self.formations == nil then + self.formations = {} + end + + self.formations[GConst.BattleConst.FORMATION_TYPE.DUNGEON_WEAPON] = {} + for idx, id in pairs(heroes) do + if id and id ~= 0 then + local matchType = DataManager.HeroData:getHeroById(id):getMatchType() + self.formations[GConst.BattleConst.FORMATION_TYPE.DUNGEON_WEAPON][matchType] = id + end + end +end + function FormationData:getStageFormation() return self:getFormation(GConst.BattleConst.FORMATION_TYPE.STAGE) end