diff --git a/lua/app/config/activity.lua b/lua/app/config/activity.lua index 5716cbfd..ea3a3e3f 100644 --- a/lua/app/config/activity.lua +++ b/lua/app/config/activity.lua @@ -18,9 +18,19 @@ local activity = { ["act_type"]=4, ["start_time"]="2023-09-28 00:00:00", ["end_time"]="2023-10-08 00:00:00" + }, + [506]={ + ["act_type"]=2, + ["start_time"]="2023-09-27 00:00:00", + ["end_time"]="2023-10-05 00:00:00" + }, + [606]={ + ["act_type"]=3, + ["start_time"]="2023-10-04 00:00:00", + ["end_time"]="2023-10-12 00:00:00" } } local config = { -data=activity,count=4 +data=activity,count=6 } return config \ No newline at end of file diff --git a/lua/app/config/activity_exchange.lua b/lua/app/config/activity_exchange.lua index eb889061..d7a331cf 100644 --- a/lua/app/config/activity_exchange.lua +++ b/lua/app/config/activity_exchange.lua @@ -178,9 +178,189 @@ local activity_exchange = { ["num_for_nothing"]="Uw==" }, ["limit"]=999 + }, + [201]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14002, + ["id_for_nothing"]="VwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=300, + ["num_for_nothing"]="VQhc" + }, + ["limit"]=10 + }, + [202]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=34003, + ["id_for_nothing"]="VQxcA2Y=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [203]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=44001, + ["id_for_nothing"]="UgxcA2Q=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [204]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=54002, + ["id_for_nothing"]="UwxcA2c=", + ["num"]=3, + ["num_for_nothing"]="VQ==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=200, + ["num_for_nothing"]="VAhc" + }, + ["limit"]=10 + }, + [205]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=15, + ["id_for_nothing"]="Vw0=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=240, + ["num_for_nothing"]="VAxc" + }, + ["limit"]=3 + }, + [206]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=14, + ["id_for_nothing"]="Vww=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + ["limit"]=3 + }, + [207]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=3, + ["id_for_nothing"]="VQ==", + ["num"]=15, + ["num_for_nothing"]="Vw0=" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=10 + }, + [208]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=1, + ["id_for_nothing"]="Vw==", + ["num"]=800, + ["num_for_nothing"]="Xghc" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=999 + }, + [209]={ + ["activity"]=506, + ["reward"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=13, + ["id_for_nothing"]="Vws=", + ["num"]=1, + ["num_for_nothing"]="Vw==" + }, + ["cost"]={ + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + }, + ["limit"]=999 } } local config = { -data=activity_exchange,count=9 +data=activity_exchange,count=18 } return config \ No newline at end of file diff --git a/lua/app/config/activity_rank.lua b/lua/app/config/activity_rank.lua index 92b93e93..4ca084f9 100644 --- a/lua/app/config/activity_rank.lua +++ b/lua/app/config/activity_rank.lua @@ -1,5 +1,5 @@ local activity_rank = { - [1]={ + [101]={ ["act_id"]=306, ["ranking"]={ 1, @@ -24,7 +24,7 @@ local activity_rank = { } } }, - [2]={ + [102]={ ["act_id"]=306, ["ranking"]={ 2, @@ -49,7 +49,7 @@ local activity_rank = { } } }, - [3]={ + [103]={ ["act_id"]=306, ["ranking"]={ 3, @@ -74,7 +74,7 @@ local activity_rank = { } } }, - [4]={ + [104]={ ["act_id"]=306, ["ranking"]={ 4, @@ -99,7 +99,7 @@ local activity_rank = { } } }, - [5]={ + [105]={ ["act_id"]=306, ["ranking"]={ 11, @@ -124,7 +124,7 @@ local activity_rank = { } } }, - [6]={ + [106]={ ["act_id"]=306, ["ranking"]={ 51, @@ -149,7 +149,7 @@ local activity_rank = { } } }, - [7]={ + [107]={ ["act_id"]=306, ["ranking"]={ 501, @@ -173,9 +173,184 @@ local activity_rank = { ["num_for_nothing"]="VAg=" } } + }, + [201]={ + ["act_id"]=606, + ["ranking"]={ + 1, + 1 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=100, + ["num_for_nothing"]="Vwhc" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=6, + ["num_for_nothing"]="UA==" + } + } + }, + [202]={ + ["act_id"]=606, + ["ranking"]={ + 2, + 2 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=80, + ["num_for_nothing"]="Xgg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=5, + ["num_for_nothing"]="Uw==" + } + } + }, + [203]={ + ["act_id"]=606, + ["ranking"]={ + 3, + 3 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=70, + ["num_for_nothing"]="UQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=47, + ["id_for_nothing"]="Ug8=", + ["num"]=4, + ["num_for_nothing"]="Ug==" + } + } + }, + [204]={ + ["act_id"]=606, + ["ranking"]={ + 4, + 10 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=60, + ["num_for_nothing"]="UAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=3, + ["num_for_nothing"]="VQ==" + } + } + }, + [205]={ + ["act_id"]=606, + ["ranking"]={ + 11, + 50 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=40, + ["num_for_nothing"]="Ugg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=2, + ["num_for_nothing"]="VA==" + } + } + }, + [206]={ + ["act_id"]=606, + ["ranking"]={ + 51, + 500 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=30, + ["num_for_nothing"]="VQg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=6, + ["id_for_nothing"]="UA==", + ["num"]=1, + ["num_for_nothing"]="Vw==" + } + } + }, + [207]={ + ["act_id"]=606, + ["ranking"]={ + 501, + 99999999 + }, + ["reward"]={ + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=52, + ["id_for_nothing"]="Uwo=", + ["num"]=20, + ["num_for_nothing"]="VAg=" + }, + { + ["type"]=1, + ["type_for_nothing"]="Vw==", + ["id"]=2, + ["id_for_nothing"]="VA==", + ["num"]=20, + ["num_for_nothing"]="VAg=" + } + } } } local config = { -data=activity_rank,count=7 +data=activity_rank,count=14 } return config \ No newline at end of file diff --git a/lua/app/config/chapter_board_rune.lua b/lua/app/config/chapter_board_rune.lua index 475c18ff..b2f98f4d 100644 --- a/lua/app/config/chapter_board_rune.lua +++ b/lua/app/config/chapter_board_rune.lua @@ -6540,7 +6540,7 @@ local chapter_board_rune = { [24]={ ["board"]={ { - 32, + 31, 0 }, { @@ -6564,7 +6564,7 @@ local chapter_board_rune = { 5 }, { - 32, + 31, 0 }, { @@ -6664,7 +6664,7 @@ local chapter_board_rune = { 0 }, { - 32, + 31, 0 }, { @@ -6712,7 +6712,7 @@ local chapter_board_rune = { 0 }, { - 32, + 31, 0 }, { @@ -6720,7 +6720,7 @@ local chapter_board_rune = { 0 }, { - 32, + 31, 0 }, { @@ -6728,7 +6728,7 @@ local chapter_board_rune = { 0 }, { - 32, + 31, 0 }, { diff --git a/lua/app/config/chapter_dungeon_rune.lua b/lua/app/config/chapter_dungeon_rune.lua index e6b78bbb..d7648954 100644 --- a/lua/app/config/chapter_dungeon_rune.lua +++ b/lua/app/config/chapter_dungeon_rune.lua @@ -2527,7 +2527,7 @@ local chapter_dungeon_rune = { ["requirement"]={ { 2, - 32, + 31, 6 }, { diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index a19af501..ff57bd4f 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -555,6 +555,7 @@ local LocalizationGlobalConst = RUNES_DESC_25 = "RUNES_DESC_25", RUNES_DESC_26 = "RUNES_DESC_26", RUNES_DESC_27 = "RUNES_DESC_27", + RUNES_DESC_28 = "RUNES_DESC_28", DUNGEON_RUNE_DESC_1 = "DUNGEON_RUNE_DESC_1", DUNGEON_RUNE_DESC_2 = "DUNGEON_RUNE_DESC_2", DUNGEON_RUNE_DESC_3 = "DUNGEON_RUNE_DESC_3", diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index c7b67a79..016b77fe 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1760,8 +1760,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1786,8 +1786,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=2, @@ -1812,8 +1812,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=4, @@ -1838,8 +1838,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -1887,8 +1887,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -2033,8 +2033,8 @@ local skill = { 5 }, ["skill_position"]={ - 1, - 70 + 2, + 0 }, ["shake_time"]=200, ["shake_type"]=6, @@ -3675,8 +3675,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3701,8 +3701,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3727,8 +3727,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3753,8 +3753,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=100, ["shake_type"]=1, @@ -3827,8 +3827,8 @@ local skill = { 5 }, ["skill_position"]={ - 2, - 0 + 1, + 50 }, ["shake_time"]=200, ["shake_type"]=6, @@ -5622,8 +5622,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5648,8 +5648,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5674,8 +5674,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5700,8 +5700,8 @@ local skill = { }, ["obj"]=2, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=100, ["shake_type"]=1, @@ -5744,8 +5744,8 @@ local skill = { 2 }, ["skill_position"]={ - 1, - 100 + 2, + 0 }, ["shake_time"]=200, ["shake_type"]=5, @@ -9119,7 +9119,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=100, ["shake_type"]=2, @@ -9145,7 +9145,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=100, ["shake_type"]=2, @@ -9171,7 +9171,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=100, ["shake_type"]=1, @@ -9197,7 +9197,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=100, ["shake_type"]=2, @@ -9234,7 +9234,7 @@ local skill = { ["obj"]=2, ["skill_position"]={ 1, - 100 + 25 }, ["shake_time"]=200, ["shake_type"]=6, diff --git a/lua/app/config/skill_rogue.lua b/lua/app/config/skill_rogue.lua index 30b4e22c..13ed1d92 100644 --- a/lua/app/config/skill_rogue.lua +++ b/lua/app/config/skill_rogue.lua @@ -5323,14 +5323,14 @@ local skill_rogue = { ["limit_times"]=1, ["weight"]=3000, ["qlt"]=4, - ["type"]=9, + ["type"]=12, ["skill_position"]=5, ["effect"]={ { ["type"]="add_skill", ["num"]=5400421, ["ratio"]=10000, - ["round"]=999 + ["round"]=1 } }, ["obj"]=7, @@ -5400,7 +5400,7 @@ local skill_rogue = { ["type"]="add_skill", ["num"]=5400425, ["ratio"]=10000, - ["round"]=999 + ["round"]=1 } }, ["obj"]=7, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 82bc3318..aa120fe1 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -555,6 +555,7 @@ local localization_global = ["RUNES_DESC_25"] = "符文淬炼至少保留1个未锁符文", ["RUNES_DESC_26"] = "Lv{0}", ["RUNES_DESC_27"] = "符文铸台{0}级后开启", + ["RUNES_DESC_28"] = "您有S级以上的属性未锁定，是否要继续淬炼？", ["DUNGEON_RUNE_DESC_1"] = "目标", ["DUNGEON_RUNE_DESC_2"] = "再次挑战", ["DUNGEON_RUNE_DESC_3"] = "通关获得", diff --git a/lua/app/config/strings/cn/skill.lua b/lua/app/config/strings/cn/skill.lua index cc55192a..2b772217 100644 --- a/lua/app/config/strings/cn/skill.lua +++ b/lua/app/config/strings/cn/skill.lua @@ -90,7 +90,7 @@ local skill = { ["desc"]="堕落之剑:额外造成一次大量技能伤害，附加腐败效果，1回合。" }, [1400420]={ - ["desc"]="九尾祥瑞：将周围4个元素变色，并造成多次大量技能伤害。" + ["desc"]="九尾祥瑞：将周围4个元素变色，并造成一次大量技能伤害。" }, [2400420]={ ["desc"]="啊，打！：使用后本次伤害提升，并额外造成多次大量技能伤害。" @@ -99,7 +99,7 @@ local skill = { ["desc"]="刺杀艺术：使用后本次伤害提升，并额外造成多次大量技能伤害。" }, [4400420]={ - ["desc"]="飞棺降物：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="飞棺降物：额外造成多次技能伤害，附加冰霜效果，1回合。" }, [5400420]={ ["desc"]="武神意志：随机消除3个元素，并造成一次技能伤害。" diff --git a/lua/app/config/strings/cn/skill_rogue.lua b/lua/app/config/strings/cn/skill_rogue.lua index ab9e92c8..4686e733 100644 --- a/lua/app/config/strings/cn/skill_rogue.lua +++ b/lua/app/config/strings/cn/skill_rogue.lua @@ -852,7 +852,7 @@ local skill_rogue = { ["desc"]="堕落之剑附加的昏睡效果，回合数+1。" }, [1400400]={ - ["desc"]="解锁九尾祥瑞：将周围4个元素变色，并造成多次大量技能伤害。" + ["desc"]="解锁九尾祥瑞：将周围4个元素变色，并造成一次大量技能伤害。" }, [1400401]={ ["desc"]="九尾祥瑞可附加魅惑效果，1回合。" @@ -924,7 +924,7 @@ local skill_rogue = { ["desc"]="绿意之刺链接6个元素及以上时，技能攻击额外释放一次。" }, [4400400]={ - ["desc"]="解锁飞棺降物：额外造成一次技能伤害，附加冰霜效果，1回合。" + ["desc"]="解锁飞棺降物：额外造成多次技能伤害，附加冰霜效果，1回合。" }, [4400401]={ ["desc"]="已逝行者普攻有10%概率附加腐败效果，2回合。" diff --git a/lua/app/module/runes/runes_const.lua b/lua/app/module/runes/runes_const.lua index ec960a1f..12a4ccec 100644 --- a/lua/app/module/runes/runes_const.lua +++ b/lua/app/module/runes/runes_const.lua @@ -17,6 +17,9 @@ RunesConst.QUALITY_ICON = { [8] = "hero_rune_ss", } +-- 检查锁定状态 +RunesConst.CHECK_QLT_LOCK = 7 + -- 最大属性栏位数 RunesConst.MAX_ATTR_GRID_COUNT = 6 -- 品质个数 diff --git a/lua/app/ui/hero/runes_info_comp.lua b/lua/app/ui/hero/runes_info_comp.lua index 4ccd24e3..aa6311f6 100644 --- a/lua/app/ui/hero/runes_info_comp.lua +++ b/lua/app/ui/hero/runes_info_comp.lua @@ -57,7 +57,7 @@ function RunesInfoComp:init() boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, showToday = GConst.MESSAGE_BOX_SHOW_TODAY.RUNES_AUTO, okFunc = function() - self:reqQuenching(true) + self:checkQuenching(true) end, } GFunc.showMessageBox(params) @@ -66,7 +66,7 @@ function RunesInfoComp:init() end end) self.btnUse:addClickListener(function() - self:reqQuenching(false) + self:checkQuenching(false) end) self:bind(DataManager.BagData.ItemData, "dirty", function() self:refresh() @@ -172,8 +172,8 @@ function RunesInfoComp:refreshSuit() self.txEmpty:setActive(isEmpty) end --- 请求淬炼 -function RunesInfoComp:reqQuenching(isAuto) +-- 检查淬炼 +function RunesInfoComp:checkQuenching(isAuto) -- 是否全部锁定 if DataManager.RunesData:getRunes(self.heroEntity:getCfgId()):getAttrLockCount() >= DataManager.RunesData:getUnlockCount() then GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_25)) @@ -186,6 +186,23 @@ function RunesInfoComp:reqQuenching(isAuto) return end + if self.runesEntity:isUnlockHighQlt() then + local params ={ + content = I18N:getGlobalText(I18N.GlobalConst.RUNES_DESC_28), + boxType = GConst.MESSAGE_BOX_TYPE.MB_OK_CANCEL, + okText = I18N:getGlobalText(I18N.GlobalConst.CONTINUE_DESC), + okFunc = function() + self:reqQuenching(isAuto) + end, + } + GFunc.showMessageBox(params) + else + self:reqQuenching(isAuto) + end +end + +-- 请求淬炼 +function RunesInfoComp:reqQuenching(isAuto) if isAuto then -- 自动淬炼 self.mask:setActive(true) diff --git a/lua/app/userdata/runes/runes_entity.lua b/lua/app/userdata/runes/runes_entity.lua index 51c46801..fffb0d18 100644 --- a/lua/app/userdata/runes/runes_entity.lua +++ b/lua/app/userdata/runes/runes_entity.lua @@ -45,6 +45,17 @@ function RunesEntity:getAttrLockCount() return lock end +-- 是否存在品质大于s的未锁定 +function RunesEntity:isUnlockHighQlt() + for idx, data in ipairs(self.grids) do + if self:getGridQuality(idx) >= GConst.RunesConst.CHECK_QLT_LOCK and not self:isAttrLock(idx) then + return true + end + end + + return false +end + -- 获取锻造的材料消耗 function RunesEntity:getMaterialCost() local base = GFunc.getConstReward("runes_cost_base")