xiyou_yueNanZhengshi
parent
b1fcba1cc7
commit
7a3891f00d
|
|
@ -735,7 +735,7 @@
|
|||
[10734] = GetLanguageStrById(",收宝箱奖励后数量<color=#529864>溢出</color>的部分将会<color=#529864>丢失</color>,是否继续?"),
|
||||
[10735] = GetLanguageStrById("奖励正在积攒中!"),
|
||||
[10736] = GetLanguageStrById("特权"),
|
||||
[10737] = GetLanguageStrById("+%d/分钟"),
|
||||
[10737] = GetLanguageStrById("+%s分钟"),
|
||||
[10738] = GetLanguageStrById("即将解锁"),
|
||||
[10739] = GetLanguageStrById("该章节已通关"),
|
||||
[10740] = GetLanguageStrById("该章节未开启"),
|
||||
|
|
|
|||
|
|
@ -2694,18 +2694,19 @@ 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],
|
||||
ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, Star).Stars)
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, Star).Stars))
|
||||
end
|
||||
|
||||
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,
|
||||
QualityNameDef[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality])
|
||||
GetLanguageStrById(QualityNameDef
|
||||
[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality]))
|
||||
else
|
||||
return string.format(Language[13122], num,
|
||||
QualityNameDef[ConfigManager.GetConfigDataByKey(ConfigName.EquipConfig, "Star", Star).Quality],
|
||||
ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, Star).Stars)
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, Star).Stars))
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -3186,7 +3187,8 @@ function GetFunctionOpenTip(_funId)
|
|||
elseif openRule[1] == 5 and GodsWayTowerManager.GetTowerFloorByType(1) < openRule[2] then
|
||||
return tip
|
||||
elseif openRule[1] == 6 and PracticeManager.PracticeLevel < openRule[2] then
|
||||
local name = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.XiuXianConfig, openRule[2]).RealmName) or ""
|
||||
local name = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.XiuXianConfig, openRule[2]).RealmName) or
|
||||
""
|
||||
tip = name .. Language[11622]
|
||||
return tip
|
||||
end
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@ function FightAreaRewardPopup:BindEvent()
|
|||
local isPopUp = RedPointManager.PlayerPrefsGetStr(PlayerManager.uid .. "mazeTreasureMax")
|
||||
local currentTime = os.date("%Y%m%d", PlayerManager.serverTime)
|
||||
local mazeTreasureMax = ConfigManager.GetConfigData(ConfigName.PlayerLevelConfig, PlayerManager.level)
|
||||
.MazeTreasureMax
|
||||
.MazeTreasureMax
|
||||
local str = Language[10726] ..
|
||||
BagManager.GetItemCountById(FindTreasureManager.materialItemId) .. "/" .. mazeTreasureMax ..
|
||||
Language[10727] ..
|
||||
GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ItemConfig, FindTreasureManager.materialItemId)
|
||||
.Name) ..
|
||||
.Name) ..
|
||||
Language[10734]
|
||||
|
||||
if BagManager.GetItemCountById(FindTreasureManager.materialItemId) >= mazeTreasureMax and isPopUp ~= currentTime then
|
||||
|
|
@ -244,7 +244,7 @@ function this.PriAdapter(num, data)
|
|||
_ExtraRewardList[num].lv = Util.GetGameObject(_ExtraRewardList[num].go, "lv"):GetComponent("Text")
|
||||
_ExtraRewardList[num].content = Util.GetGameObject(_ExtraRewardList[num].go, "content"):GetComponent("Text")
|
||||
_ExtraRewardList[num].iconText = Util.GetGameObject(_ExtraRewardList[num].icon.transform, "Text"):GetComponent(
|
||||
"Text")
|
||||
"Text")
|
||||
end
|
||||
_ExtraRewardList[num].go.gameObject:SetActive(true)
|
||||
_ExtraRewardList[num].icon.sprite = this.spLoader:LoadSprite(data.sprite)
|
||||
|
|
@ -283,6 +283,7 @@ function this.ItemAdapter(node, data)
|
|||
-- end
|
||||
-- LogGreen("addValue:"..addValue)
|
||||
local baseValue = string.format(Language[10737], data[2])
|
||||
LogError("#############" .. baseValue)
|
||||
if addValue - 1 <= 0 then
|
||||
txt.text = baseValue
|
||||
else
|
||||
|
|
|
|||
|
|
@ -307,7 +307,7 @@ function this.SetSkillInfo(_skillInfoObj, _titleStr, _skillDatas)
|
|||
Util.GetGameObject(_skillInfoObj, "title"):GetComponent("Text").text = GetLanguageStrById(_titleStr)
|
||||
local desStr = ""
|
||||
for i = 1, #_skillDatas do
|
||||
desStr = desStr .. string.format("【%s】%s", GetLanguageStrById(_skillDatas[i].title), _skillDatas[i].des)
|
||||
desStr = desStr .. string.format("【%s】%s", GetLanguageStrById(_skillDatas[i].title), GetLanguageStrById(_skillDatas[i].des))
|
||||
if i < #_skillDatas then
|
||||
desStr = desStr .. "\n"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ GMShuaChongTeQuan = Inherit(BasePanel)
|
|||
self = GMShuaChongTeQuan
|
||||
local sortingOrder = 0
|
||||
local TabBox = require("Modules/Common/TabBox")
|
||||
local _TabData = {
|
||||
local _TabData = {
|
||||
--[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "刷充GM",img = "gm_shuachong_scGM_01_zh",id=2201,scale=0,all=0 },
|
||||
[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "超级特权" ,img = "gm_shuachong_cjGM_01_zh",id=2202,scale=6,all=128},
|
||||
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神级特权" ,img = "gm_shuachong_sjGM_01_zh",id=2203,scale=5,all=400 },
|
||||
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "无上特权",img = "gm_shuachong_wsGM_01_zh",id=2204,scale=2,all=3500 },
|
||||
[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "超级特权", img = "gm_shuachong_cjGM_01_zh", id = 2202, scale = 6, all = 128 },
|
||||
[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神级特权", img = "gm_shuachong_sjGM_01_zh", id = 2203, scale = 5, all = 400 },
|
||||
[3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "无上特权", img = "gm_shuachong_wsGM_01_zh", id = 2204, scale = 2, all = 3500 },
|
||||
}
|
||||
|
||||
-- function GMShuaChongTeQuan:New(gameObject)
|
||||
|
|
@ -54,7 +54,7 @@ function GMShuaChongTeQuan:InitComponent()
|
|||
TabAdapter = function(tab, index, status)
|
||||
local tabLab = Util.GetGameObject(tab, "Text")
|
||||
Util.GetGameObject(tab, "Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(_TabData[index][status])
|
||||
tabLab:GetComponent("Text").text = _TabData[index].name
|
||||
tabLab:GetComponent("Text").text = GetLanguageStrById(_TabData[index].name)
|
||||
local red = Util.GetGameObject(tab, "Redpot")
|
||||
red:SetActive(ActivityGiftManager.GetActivityInfo(ActivityTypeDef.shuaChongTeQuan, _TabData[index].id).state == 1)
|
||||
redList[_TabData[index].id] = red
|
||||
|
|
@ -103,7 +103,7 @@ function GMShuaChongTeQuan:InitComponent()
|
|||
if lastState == 0 then
|
||||
self.btn_buy:SetActive(false)
|
||||
self.hintTxt.gameObject:SetActive(true)
|
||||
self.hintTxt.text = Language[11979] .. _TabData[_index - 1].name .. Language[11991]
|
||||
self.hintTxt.text = Language[11979] .. GetLanguageStrById(_TabData[_index - 1].name) .. Language[11991]
|
||||
else
|
||||
self.btn_buy:SetActive(true)
|
||||
self.hintTxt.gameObject:SetActive(false)
|
||||
|
|
|
|||
|
|
@ -245,8 +245,8 @@ function RoleInfoLayout:SetData(_sortinglayer, _parent, _curHerodata, _isUpZhen,
|
|||
this:UpdateHeroUpLvAndBreakData() --升级
|
||||
--角色定位按钮
|
||||
this.posBtn.gameObject:SetActive(curHeroData.heroConfig.ShowHeroLocation == 1)
|
||||
this.posInfo.text = curHeroData.star < 11 and curHeroData.heroConfig.HeroLocationDesc1 or
|
||||
curHeroData.heroConfig.HeroLocationDesc4
|
||||
this.posInfo.text = GetLanguageStrById(curHeroData.star < 11 and curHeroData.heroConfig.HeroLocationDesc1 or
|
||||
curHeroData.heroConfig.HeroLocationDesc4)
|
||||
ForceRebuildLayout(this.posBtn.transform)
|
||||
this.SkillInfo()
|
||||
end
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ function SpecailTrainingInfoPopup:SetSingleData(index, _go, _data)
|
|||
singleTextList[j].transform.localScale = Vector3.one
|
||||
singleTextList[j].transform.localPosition = Vector3.zero
|
||||
end
|
||||
singleTextList[j]:GetComponent("Text").text = str1 .. str2
|
||||
singleTextList[j]:GetComponent("Text").text = GetLanguageStrById(str1) .. str2
|
||||
singleTextList[j]:SetActive(true)
|
||||
end
|
||||
if tData.Level > curLevel then
|
||||
|
|
|
|||
Loading…
Reference in New Issue