适配更改
parent
7be6862e83
commit
8f1677f1d9
|
|
@ -5092,7 +5092,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 343, y: -25}
|
||||
m_AnchoredPosition: {x: 400, y: -25}
|
||||
m_SizeDelta: {x: 101.2, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5481993228925038571
|
||||
|
|
@ -15891,7 +15891,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 264.1, y: -25}
|
||||
m_AnchoredPosition: {x: 321.1, y: -25}
|
||||
m_SizeDelta: {x: 250, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7364722381552083636
|
||||
|
|
@ -61304,7 +61304,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 93, y: 0}
|
||||
m_AnchoredPosition: {x: 130, y: 0}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2075313471629493678
|
||||
|
|
|
|||
|
|
@ -2693,7 +2693,8 @@ end
|
|||
function GetEquipSuitStr(Star, num)
|
||||
-- return string.format("%s件%s%s星激活",num,QualityNameDef[ ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig,"Star",Star).Quality],ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,Star).Stars)
|
||||
return string.format(Language[13120], num,
|
||||
QualityNameDef[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality],
|
||||
QualityNameDef
|
||||
[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality],
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, Star).Stars))
|
||||
end
|
||||
|
||||
|
|
@ -2701,11 +2702,12 @@ function GetEquipSuitStr2(Star, num)
|
|||
-- return string.format("%s件%s%s星激活",num,QualityNameDef[ ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig,"Star",Star).Quality],ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,Star).Stars)
|
||||
if ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality > 6 then
|
||||
return string.format(Language[13121], num,
|
||||
GetLanguageStrById(QualityNameDef
|
||||
[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality]))
|
||||
QualityNameDef
|
||||
[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality])
|
||||
else
|
||||
return string.format(Language[13122], num,
|
||||
QualityNameDef[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality],
|
||||
QualityNameDef
|
||||
[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality],
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, Star).Stars))
|
||||
end
|
||||
end
|
||||
|
|
@ -2807,7 +2809,7 @@ function GetEquipSuitStr(Star, num)
|
|||
local suitConfig = ConfigManager.GetConfigData(ConfigName.EquipSuiteConfig, Star)
|
||||
-- return string.format("%s件%s%s星装备激活",num,QualityNameDef[ ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig,"Star",Star).Quality],ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,Star).Stars)
|
||||
if qua > 6 then
|
||||
return string.format(Language[13123], num, suitConfig.Name)
|
||||
return string.format(Language[13123], num, GetLanguageStrById(suitConfig.Name))
|
||||
else
|
||||
return string.format(Language[13120], num,
|
||||
QualityNameDef[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality],
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@ function this.OnShowSingleCardData(go, heroData) --isSelect 1选择 2 没选择
|
|||
local heroId = talismana.HeroID
|
||||
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroId)
|
||||
if heroConfig then
|
||||
belongName.text = GetLanguageStrById(heroConfig.ReadingName) .. Language[12669]
|
||||
belongName.text = SubString2(GetLanguageStrById(heroConfig.ReadingName) .. Language[12669], 8)
|
||||
else
|
||||
belongName.text = ""
|
||||
end
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ function JumpViewNew:OnOpen(jumpId, heroConfig, parent)
|
|||
self.desc.text = Language[13078]
|
||||
elseif self.jumpSData.Type == JumpType.Store then
|
||||
if self.jumpSData.Skipfactor[1] == SHOP_TYPE.ENDLESS_SHOP then
|
||||
self.info.text = self.info.text .. Language[13079]
|
||||
self.info.text = GetLanguageStrById(self.info.text) .. Language[13079]
|
||||
end
|
||||
local storeTypeConfig = ConfigManager.GetConfigDataByKey(ConfigName.StoreTypeConfig, "StoreType",
|
||||
self.jumpSData.Skipfactor[1])
|
||||
|
|
@ -116,7 +116,7 @@ function JumpViewNew:OnOpen(jumpId, heroConfig, parent)
|
|||
if costItemId ~= 0 then
|
||||
self.costIconPos.gameObject:SetActive(true)
|
||||
self.itemView:OnOpen(false, { costItemId, 0 }, 0.4, false, false, false, self.parent.sortingOrder)
|
||||
self.desc.text = string.format("<color=#%s>%s:%s/%s</color>", color, ItemConfig[costItemId].Name, itemcount,
|
||||
self.desc.text = string.format("<color=#%s>%s:%s/%s</color>", color, GetLanguageStrById(ItemConfig[costItemId].Name), itemcount,
|
||||
needCostNum)
|
||||
else
|
||||
self.costIconPos.gameObject:SetActive(false)
|
||||
|
|
@ -152,7 +152,7 @@ function JumpViewNew:OnOpen(jumpId, heroConfig, parent)
|
|||
color = "12C10B"
|
||||
--self.btnSureIma.sprite = self.parent.spLoader:LoadSprite("r_hero_button_001")
|
||||
end
|
||||
self.desc.text = string.format("<color=#%s>%s:%s/%s</color>", color, ItemConfig[costItemId].Name, itemcount,
|
||||
self.desc.text = string.format("<color=#%s>%s:%s/%s</color>", color, GetLanguageStrById(ItemConfig[costItemId].Name), itemcount,
|
||||
needCostNum)
|
||||
elseif self.jumpSData.Type == 30003 then
|
||||
self.btnSureText.text = Language[13080]
|
||||
|
|
@ -162,7 +162,7 @@ function JumpViewNew:OnOpen(jumpId, heroConfig, parent)
|
|||
color = "12C10B"
|
||||
--self.btnSureIma.sprite = self.parent.spLoader:LoadSprite("r_hero_button_001")
|
||||
end
|
||||
self.desc.text = string.format("<color=#%s>%s:%s/%s</color>", color, ItemConfig[self.needChipId].Name, itemcount,
|
||||
self.desc.text = string.format("<color=#%s>%s:%s/%s</color>", color, GetLanguageStrById(ItemConfig[self.needChipId].Name), itemcount,
|
||||
self.needChipNum)
|
||||
elseif self.jumpSData.Type == JumpType.recharge then
|
||||
self.costIconPos.gameObject:SetActive(false)
|
||||
|
|
|
|||
Loading…
Reference in New Issue