root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cardelaycarbon update

dev_chengFeng
jiaoyangna 2020-07-28 22:25:51 +08:00
parent 97b7118e11
commit 36070bc0c0
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua
View File

@ -254,6 +254,8 @@ function this.UpdateCarbonContent()
end
if data.id == -1 then
Util.SetGray(v,true)
elseif data.id == FUNCTION_OPEN_TYPE.CARDELAY then
Util.SetGray(v,not ActTimeCtrlManager.IsQualifiled(data.id))
else
Util.SetGray(v,not ActTimeCtrlManager.SingleFuncState(data.id))
end
@ -302,8 +304,8 @@ function this.BtnClick(id)
PopupTipPanel.ShowTip(Language[10327])
return
end
if ActTimeCtrlManager.SingleFuncState(id) then
UIManager.OpenPanel(UIName.GuildCarDelayMainPanel)
if ActTimeCtrlManager.IsQualifiled(id) then
UIManager.OpenPanel(UIName.GuildCarDelayMainPanel)
else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id))
end

15
Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
View File

@ -308,9 +308,18 @@ function this.GetElementIndex(curFormation)
local waterElementNum = 0
local groundElementNum = 0
for i = 1, #curFormation do--将所有元素信息存入列表
local heroPropertyType = HeroManager.GetSingleHeroData(curFormation[i].heroId).heroConfig.PropertyName
table.insert(elementPropertyList, heroPropertyType)
for _,go in pairs(curFormation) do--将所有元素信息存入列表
if go and go.heroId then
local temp = HeroManager.GetSingleHeroData(go.heroId)
if not temp then
LogGreen(go.heroId.."这个英雄不存在")
else
local heroPropertyType = temp.heroConfig.PropertyName
table.insert(elementPropertyList, heroPropertyType)
end
else
LogGreen(_.."这个编队的这个英雄不存在")
end
end
for i, v in pairs(elementPropertyList) do--遍历该列表拿筛选出各元素
if (v == 1) then

2
Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua
View File

@ -119,7 +119,7 @@ function this.SingleInfoDataShow(go,data)
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(curHeroConfig.Icon))
Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroConfig.Star))
SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), data.teamInfo[i].star)
if heroConfig.Star > 9 then
if data.teamInfo[i].star > 9 then
Util.GetGameObject(go,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
else
Util.GetGameObject(go,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)