Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
gaoxin 2021-06-09 18:11:12 +08:00
commit 3dd0e302b2
2 changed files with 14 additions and 4 deletions

View File

@ -338,9 +338,9 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_BestFit: 1
m_MinSize: 4
m_MaxSize: 48
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1

View File

@ -174,7 +174,17 @@ function this.InitCompShow()
this.rewardList[j].gameObject:SetActive(false)
end
end
this.bossGridText.text = ConfigManager.GetConfigDataByKey(ConfigName.endlessDifficulty,"MapPool",EndLessMapManager.openMapId).Desc
local configs = ConfigManager.GetAllConfigsDataByKey(ConfigName.endlessDifficulty,"MapPool",EndLessMapManager.openMapId)
local lv = PlayerManager.level
local config = nil
for i = 1,#configs do
if lv >= configs[i].WorldLevel[1] and lv <= configs[i].WorldLevel[2] then
config = configs[i]
end
end
this.bossGridText.text = config.Desc
local mapData = endLessConfig[EndLessMapManager.openMapId]
this.miniMapName.text = config.Title
end
function this.SetStaticData()
@ -194,7 +204,7 @@ function this.SetStaticData()
PlayUIAnim(this.rewardList[i].gameObject)
end, 0.001 * (i - 1)):Start()
end
this.miniMapName.text = GetLanguageStrById(mapData.Info)
end
-- 行动力是否显示倒计时