Merge branch '0功能/本周版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/本周版本优化内容

dev_chengFeng
jiaoyangna 2021-02-02 14:26:14 +08:00
commit c57ab9ea78
3 changed files with 8 additions and 4 deletions

View File

@ -159,12 +159,12 @@ function this.OnClickTabBtn(_index, _clickBtn, isTop)
print("_index ".._index)
if _index == ItemBaseType.Equip then
local allEquipData = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip)
local allEquipNum = 0
-- local allEquipNum = 0
for i, v in pairs(allEquipData) do
table.insert(itemData, v)
allEquipNum = allEquipNum + v.num
-- allEquipNum = allEquipNum + v.num
end
itemNumText.text = Language[10188]..allEquipNum.."/"..ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipNumlimit
itemNumText.text = Language[10188]..LengthOfTable(allEquipData).."/"..ConfigManager.GetConfigData(ConfigName.GameSetting,1).EquipNumlimit
this:SetItemData(itemData, isTop)
-- elseif _index == 0 then
-- this:OnClickAllBtn()

View File

@ -801,6 +801,10 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag
return
end
if targetRole.ctrl_noheal or targetRole:IsDead() then --禁疗和死亡无法加血
--禁疗并且没有死亡的单位显示血量+0 不走后面代码,防止触发后面的被动 by:王振兴 2021/1/27
if targetRole.ctrl_noheal and not targetRole:IsDead() then
targetRole.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, 0, 0)
end
return
end
baseFactor = baseFactor or 1

View File

@ -150,7 +150,7 @@ function this.SingleItemDataShow(_go,_curequipSign)
Util.GetGameObject(_go.transform,"circleFrameBg/Icon"):GetComponent("Image").sprite=Util.LoadSprite(GetResourcePath(itemConfig[curequipSign.Id].ResourceID))
Util.GetGameObject(_go.transform,"circleFrameBg/circleFrame"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circle)
Util.GetGameObject(_go.transform,"circleFrameBg"):GetComponent("Image").sprite=Util.LoadSprite(SoulPrintSpriteByQuantity[itemConfig[curequipSign.Id].Quantity].circleBg2)
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text=curequipSign.Name
Util.GetGameObject(_go.transform,"name"):GetComponent("Text").text= string.gsub(curequipSign.Name,"魂印","",1);--curequipSign.Name
Util.GetGameObject(_go.transform, "UI_effect_WuCai_Kuang"):SetActive(curequipSign.Quality == 7)
Util.AddParticleSortLayer( Util.GetGameObject(_go,"UI_effect_WuCai_Kuang/juneng_chenggong (1)"), sortingOrder - sortingOrder2 )
local choosed =Util.GetGameObject(_go.transform, "choosed")