diff --git a/lua/app/ui/hero/weapon_info_comp.lua b/lua/app/ui/hero/weapon_info_comp.lua index 2d95721f..b62fc424 100644 --- a/lua/app/ui/hero/weapon_info_comp.lua +++ b/lua/app/ui/hero/weapon_info_comp.lua @@ -7,6 +7,7 @@ function WeaponInfoComp:init() self.txName = uiMap["weapon_info.name.tx_name"] self.imgWeapon = uiMap["weapon_info.img_weapon"] + self.rootEffect = uiMap["weapon_info.root_effect"] self.txLevel = uiMap["weapon_info.level.tx_level"] self.txDesc1 = uiMap["weapon_info.tx_desc_1"] self.txDesc2 = uiMap["weapon_info.tx_desc_2"] @@ -151,6 +152,12 @@ function WeaponInfoComp:refresh() self.btnUp:removeRedPoint() self.btnUp:setSprite(GConst.ATLAS_PATH.COMMON, BTN_ICON[2]) end + + + -- 特效 + -- EffectManager:loadUIEffectAsync("assets/prefabs/effects/ui/vfs_ui_wuqi_changzhu_b01".. DataManager.ArenaData:getGradingIconName(gradingId) ..".prefab", self, self.rootEffect, GConst.UI_EFFECT_ORDER.LEVEL5, function(obj) + -- obj:play() + -- end) end return WeaponInfoComp \ No newline at end of file diff --git a/lua/app/userdata/dungeon/dungeon_armor_entity.lua b/lua/app/userdata/dungeon/dungeon_armor_entity.lua index b285e31f..a7e581e5 100644 --- a/lua/app/userdata/dungeon/dungeon_armor_entity.lua +++ b/lua/app/userdata/dungeon/dungeon_armor_entity.lua @@ -402,7 +402,7 @@ end -- 基金是否有红点 function DungeonArmorEntity:isHasFundRedDot() - return self:isCanWatchFundAd() or self:hasCanGetFundReward() + return self:isCanWatchFundAd() or (self:isBoughtFundStage(self:getCurFundStage()) and self:hasCanGetFundReward()) end -- 基金阶段是否已购买 diff --git a/lua/app/userdata/equip/equip_entity.lua b/lua/app/userdata/equip/equip_entity.lua index a268ff23..4d14d1cc 100644 --- a/lua/app/userdata/equip/equip_entity.lua +++ b/lua/app/userdata/equip/equip_entity.lua @@ -187,8 +187,12 @@ end -- 获取属性描述 function EquipEntity:getAttrDesc() - local strAttr = "" local stage = self:getStage() + if self:getPart() ~= GConst.EquipConst.PART_TYPE.WEAPON then + stage = DataManager.EquipData:getMinArmorStage(self:getHeroId()) + end + + local strAttr = "" for i = 1, stage + 1 do if i > #self.cfg.features_level or i > #self.cfg.features_attr then break