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-24 21:47:52 +08:00
commit d8c8591e40
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua/app/module/equip/equip_manager.lua
View File

@ -7,6 +7,11 @@ function EquipManager:reqUpgrade(id, part)
return
end
local heroEntity = DataManager.HeroData:getHeroById(id)
if heroEntity == nil or not heroEntity:isUnlock() then
return
end
for index, cost in ipairs(entity:getUpgradeMaterials()) do
if cost.num > DataManager.BagData.ItemData:getItemNumById(cost.id) then
GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.EQUIP_DESC_8))

2
lua/app/ui/battle/battle_result_ui.lua
View File

@ -495,6 +495,7 @@ function BattleResultUI:showRewardAppearAnim(idx, cell)
local delay = (idx - 1) * 0.05
local scaleX = selfObj:fastGetLocalScale()
cell:setTouchEnable(false)
local animRewardAppear = selfObj:createBindTweenSequence()
animRewardAppear:Insert(0, canvasGroup:DOFade(0, 0))
animRewardAppear:Insert(0, selfObj:getTransform():DOScale(scaleX * 0.6, 0))
@ -503,6 +504,7 @@ function BattleResultUI:showRewardAppearAnim(idx, cell)
animRewardAppear:Insert(0.4 + delay, selfObj:getTransform():DOScale(scaleX * 1, 0.13))
animRewardAppear:OnComplete(function()
animRewardAppear = nil
cell:setTouchEnable(true)
end)
return animRewardAppear
end

2
lua/app/ui/common/mop_up_ui.lua
View File

@ -125,6 +125,7 @@ function MopUpUI:showRewardAppearAnim(idx, cell)
local delay = (idx - 1) * 0.05
local scaleX = selfObj:fastGetLocalScale()
cell:setTouchEnable(false)
local animRewardAppear = selfObj:createBindTweenSequence()
animRewardAppear:Insert(0, canvasGroup:DOFade(0, 0))
animRewardAppear:Insert(0, selfObj:getTransform():DOScale(scaleX * 0.6, 0))
@ -133,6 +134,7 @@ function MopUpUI:showRewardAppearAnim(idx, cell)
animRewardAppear:Insert(0.4 + delay, selfObj:getTransform():DOScale(scaleX * 1, 0.13))
animRewardAppear:OnComplete(function()
animRewardAppear = nil
cell:setTouchEnable(true)
end)
return animRewardAppear
end

8
lua/app/ui/hero/cell/attr_cell.lua
View File

@ -90,7 +90,7 @@ end
-- 显示普攻增伤
function AttrCell:showNormalHurt()
self.imgIcon:setSprite(GConst.ATLAS_PATH.HERO, "hero_attribute_3")
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURTP))
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT))
local value = 0
if self.nodeType == GConst.HeroConst.ATTR_SHOW_TOTAL then
@ -111,7 +111,7 @@ end
-- 显示技能增伤
function AttrCell:showSkillHurt()
self.imgIcon:setSprite(GConst.ATLAS_PATH.HERO, "hero_attribute_4")
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURTP))
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT))
local value = 0
if self.nodeType == GConst.HeroConst.ATTR_SHOW_TOTAL then
@ -168,7 +168,7 @@ end
-- 显示普攻增伤百分比
function AttrCell:showNormalHurtp()
self.imgIcon:setSprite(GConst.ATLAS_PATH.HERO, "hero_attribute_3")
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURT))
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_NORMAL_HURTP))
local value = 0
if self.nodeType == GConst.HeroConst.ATTR_SHOW_TOTAL then
@ -189,7 +189,7 @@ end
-- 显示技能增伤百分比
function AttrCell:showSkillHurtp()
self.imgIcon:setSprite(GConst.ATLAS_PATH.HERO, "hero_attribute_4")
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURT))
self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ATTR_SKILL_HURTP))
local value = 0
if self.nodeType == GConst.HeroConst.ATTR_SHOW_TOTAL then

3
lua/app/ui/hero/weapon_info_comp.lua
View File

@ -122,8 +122,9 @@ function WeaponInfoComp:refresh()
self.txNum:setText("<color=#FF5252>" .. self.weaponEntity:getUpgradeGoldNum() .. "</color>")
end
self.btnUp:setTouchEnable(self.heroEntity:isUnlock())
local canLvUp = self.weaponEntity:canLevelUp()
if canLvUp then
if not self.heroEntity:isUnlock() and canLvUp then
self.btnUp:addRedPoint(120, 50, 0.6)
self.btnUp:setSprite(GConst.ATLAS_PATH.COMMON, BTN_ICON[1])
else