bug
parent
701faa8360
commit
2a87d43fd0
|
@ -2278,4 +2278,5 @@
|
||||||
[12277] = "未查询到符合条件的装备!",
|
[12277] = "未查询到符合条件的装备!",
|
||||||
[12278] = "%d天%02d时",
|
[12278] = "%d天%02d时",
|
||||||
[12279] = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力",
|
[12279] = "妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力",
|
||||||
|
[12280] = "该神将在巅峰赛阵容中已上阵",
|
||||||
}
|
}
|
||||||
|
|
|
@ -590,7 +590,7 @@ end
|
||||||
|
|
||||||
-- 通过总轮数获取当前阶段名称
|
-- 通过总轮数获取当前阶段名称
|
||||||
function this.GetTurnNameByRoundTimes(roundTimes,curTurn)
|
function this.GetTurnNameByRoundTimes(roundTimes,curTurn)
|
||||||
LogGreen("roundTimes "..roundTimes)
|
-- LogGreen("roundTimes "..roundTimes)
|
||||||
if not roundTimes or roundTimes <= 0 then
|
if not roundTimes or roundTimes <= 0 then
|
||||||
return Language[10122]
|
return Language[10122]
|
||||||
end
|
end
|
||||||
|
|
|
@ -115,7 +115,8 @@ function this:FormationAdapter(msg)
|
||||||
demon:SetActive(true)
|
demon:SetActive(true)
|
||||||
local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
|
local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
|
||||||
Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon))
|
Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon))
|
||||||
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).Star))
|
local heroConFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId)
|
||||||
|
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality,heroConFig.Star))
|
||||||
Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName
|
Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName
|
||||||
SetHeroStars(starGrid, curData.hero.star)
|
SetHeroStars(starGrid, curData.hero.star)
|
||||||
proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName))
|
proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName))
|
||||||
|
|
|
@ -343,7 +343,7 @@ function this.GetHeroFormationStr(teamId)
|
||||||
return Language[11108]
|
return Language[11108]
|
||||||
-- 1001
|
-- 1001
|
||||||
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
|
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
|
||||||
return Language[11101]
|
return Language[12280]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return ""
|
return ""
|
||||||
|
@ -367,7 +367,7 @@ function this.GetHeroFormationStr2(teamId)
|
||||||
elseif teamId == FormationTypeDef.EXPEDITION then
|
elseif teamId == FormationTypeDef.EXPEDITION then
|
||||||
return Language[10699], FormationTypeDef.EXPEDITION
|
return Language[10699], FormationTypeDef.EXPEDITION
|
||||||
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
|
elseif teamId == FormationTypeDef.ARENA_TOM_MATCH then
|
||||||
return Language[11110], FormationTypeDef.ARENA_TOM_MATCH
|
return Language[12280], FormationTypeDef.ARENA_TOM_MATCH
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return ""
|
return ""
|
||||||
|
|
|
@ -2277,3 +2277,4 @@
|
||||||
12277,未查询到符合条件的装备!
|
12277,未查询到符合条件的装备!
|
||||||
12278,%d天%02d时
|
12278,%d天%02d时
|
||||||
12279,妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力
|
12279,妖系神将额外造成50%伤害\n非妖系神将降低50%攻击力
|
||||||
|
12280,该神将在巅峰赛阵容中已上阵
|
||||||
|
|
|
Binary file not shown.
Loading…
Reference in New Issue