puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725

Browse Source
This commit is contained in:
xiekaidong 2023-07-25 16:36:28 +08:00
commit cda0708069
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lua/app/ui/dungeon/cell/dungeon_target_cell.lua
View File

@ -43,7 +43,6 @@ function DungeonTargetCell:showWeapon()
if weaponData:canFarmChapter(self.dungeonId) and remainTime > 0 then if weaponData:canFarmChapter(self.dungeonId) and remainTime > 0 then
-- 扫荡 -- 扫荡
self.isSmash = true
self.timeObj:setActive(true) self.timeObj:setActive(true)
self.powerObj:setActive(true) self.powerObj:setActive(true)
self.txBtn:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH)) self.txBtn:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH))
@ -68,7 +67,7 @@ function DungeonTargetCell:showWeapon()
self.btn:setTouchEnable(false) self.btn:setTouchEnable(false)
end end
self.btn:addClickListener(function() self.btn:addClickListener(function()
if self.isSmash then if weaponData:canFarmChapter(self.dungeonId) and remainTime > 0 then
ModuleManager.DungeonWeaponManager:reqSweep(self.dungeonId, self.target) ModuleManager.DungeonWeaponManager:reqSweep(self.dungeonId, self.target)
else else
ModuleManager.DungeonWeaponManager:showMainUI() ModuleManager.DungeonWeaponManager:showMainUI()
@ -88,7 +87,6 @@ function DungeonTargetCell:showArmor()
if armorData:canFarmChapter(self.dungeonId) and remainTime > 0 then if armorData:canFarmChapter(self.dungeonId) and remainTime > 0 then
-- 扫荡 -- 扫荡
self.isSmash = true
self.timeObj:setActive(true) self.timeObj:setActive(true)
self.powerObj:setActive(true) self.powerObj:setActive(true)
self.txBtn:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH)) self.txBtn:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH))
@ -114,7 +112,7 @@ function DungeonTargetCell:showArmor()
self.btn:setTouchEnable(false) self.btn:setTouchEnable(false)
end end
self.btn:addClickListener(function() self.btn:addClickListener(function()
if self.isSmash then if armorData:canFarmChapter(self.dungeonId) and remainTime > 0 then
ModuleManager.DungeonArmorManager:reqSweep(self.dungeonId, self.target) ModuleManager.DungeonArmorManager:reqSweep(self.dungeonId, self.target)
else else
ModuleManager.DungeonArmorManager:showMainUI() ModuleManager.DungeonArmorManager:showMainUI()

6
lua/app/ui/hero/hero_detail_ui.lua
View File

@ -120,9 +120,9 @@ function HeroDetailUI:onLoadRootComplete()
self:addEventListener(EventManager.CUSTOM_EVENT.GO_DUNGEON_UI, function() self:addEventListener(EventManager.CUSTOM_EVENT.GO_DUNGEON_UI, function()
self:closeUI() self:closeUI()
end) end)
self:bind(DataManager.BagData.ItemData:getItemById(GConst.ItemConst.ITEM_ID_GOLD), "isDirty", function() self:bind(DataManager.BagData.ItemData, "dirty", function()
self:refreshShow() self:refreshShow()
end) end)
end end
function HeroDetailUI:updateSide() function HeroDetailUI:updateSide()

3
lua/app/userdata/hero/hero_entity.lua
View File

@ -129,6 +129,9 @@ function HeroEntity:setEquipAttrValue(name, value)
end end
function HeroEntity:addEquipAttrValue(name, value) function HeroEntity:addEquipAttrValue(name, value)
if self.equipAttr[name] == nil then
self.equipAttr[name] = 0
end
self.equipAttr[name] = self.equipAttr[name] + value self.equipAttr[name] = self.equipAttr[name] + value
end end