Compare commits
3 Commits
ad5a89ea6a
...
13b857d454
Author | SHA1 | Date |
---|---|---|
|
13b857d454 | |
|
d02b470b19 | |
|
85710322d2 |
|
@ -1 +1 @@
|
|||
{"EncyptKey":"", "packageVersion":"0.1", "buglyId":"261348dcd3", "resUrl":"http://10.2.1.12/jieling_dl/dev/assetBundles/mht_china/local/", "channel":"pc", "version":"0.1.22", "subChannel":"2000", "serverUrl":"http://154.8.193.157:8080/"}
|
||||
{"EncyptKey":"", "packageVersion":"1", "buglyId":"261348dcd3", "resUrl":"http://10.2.1.12/jieling_dl/dev/assetBundles/mht_china/local/", "channel":"pc", "version":"0.1.22", "subChannel":"2000", "serverUrl":"http://154.8.193.157:8080/"}
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4795d5b0a108b3640b2e0a18ac594f97
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 8eaf385d010d8a04db0100cb760952cb
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cf6b6b8261b752d46adce98e0e3c3b5d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,24 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9321bd0ceef067d4580bae371f50f72d
|
||||
TrueTypeFontImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
fontSize: 16
|
||||
forceTextureCase: -2
|
||||
characterSpacing: 0
|
||||
characterPadding: 1
|
||||
includeFontData: 1
|
||||
fontName: UTM Cafeta
|
||||
fontNames:
|
||||
- UTM Cafeta
|
||||
fallbackFontReferences:
|
||||
- {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
- {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
customCharacters:
|
||||
fontRenderingMode: 0
|
||||
ascentCalculationMode: 1
|
||||
useLegacyBoundsCalculation: 0
|
||||
shouldRoundAdvanceValue: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -109,8 +109,8 @@
|
|||
[10108] = GetLanguageStrById("赛季奖励: "),
|
||||
[10109] = GetLanguageStrById("每日奖励: 暂无排名"),
|
||||
[10110] = GetLanguageStrById("赛季奖励: 暂无排名"),
|
||||
[10111] = GetLanguageStrById("积分: "),
|
||||
[10112] = GetLanguageStrById(" 段位积分:"),
|
||||
[10111] = GetLanguageStrById("积分:"),
|
||||
[10112] = GetLanguageStrById("段位积分:"),
|
||||
[10113] = GetLanguageStrById("%s次"),
|
||||
[10114] = GetLanguageStrById("战力:"),
|
||||
[10115] = GetLanguageStrById("免费挑战"),
|
||||
|
@ -1230,7 +1230,7 @@
|
|||
[11229] = GetLanguageStrById("角色名不存在"),
|
||||
[11230] = GetLanguageStrById("暂无推荐好友"),
|
||||
[11231] = GetLanguageStrById("好友数量:"),
|
||||
[11232] = GetLanguageStrById("已领取: "),
|
||||
[11232] = GetLanguageStrById("已领取: "),
|
||||
[11233] = GetLanguageStrById("黑名单数:"),
|
||||
[11234] = GetLanguageStrById("确认将【%s】从好友列表删除吗?"),
|
||||
[11235] = GetLanguageStrById("已赠送过友情点给好友"),
|
||||
|
@ -1524,8 +1524,8 @@
|
|||
[11523] = GetLanguageStrById("击败前一个首领方可解锁!"),
|
||||
[11524] = GetLanguageStrById("已通关"),
|
||||
[11525] = GetLanguageStrById("剩余次数:"),
|
||||
[11526] = GetLanguageStrById("<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color> "),
|
||||
[11527] = GetLanguageStrById("<color=#FFDAB6>全公会成员攻击力+ %s "),
|
||||
[11526] = GetLanguageStrById("<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color>"),
|
||||
[11527] = GetLanguageStrById("<color=#FFDAB6>全公会成员攻击力+ %s"),
|
||||
[11528] = GetLanguageStrById("(%s后失效)"),
|
||||
[11529] = GetLanguageStrById("已击败【%s】!"),
|
||||
[11530] = GetLanguageStrById("职业限定:%s"),
|
||||
|
@ -2578,7 +2578,7 @@
|
|||
[12577] = GetLanguageStrById("友情"),
|
||||
[12578] = GetLanguageStrById("等级宝箱"),
|
||||
[12579] = GetLanguageStrById("宝箱等级:"),
|
||||
[12580] = GetLanguageStrById(" 剩余妖晶召唤次数:"),
|
||||
[12580] = GetLanguageStrById("剩余妖晶召唤次数:"),
|
||||
[12581] = GetLanguageStrById("宝箱等级"),
|
||||
[12582] = GetLanguageStrById("级后开启心愿功能,\n将有更高概率获得心愿法宝~"),
|
||||
[12583] = GetLanguageStrById("%s次神将召唤后,开启心愿抽卡!"),
|
||||
|
|
|
@ -2963,12 +2963,12 @@ function CheckGMIsOpen(type, value)
|
|||
isBuy = false
|
||||
end
|
||||
end
|
||||
return isBuy, config.Name .. Language[13128]
|
||||
return isBuy, GetLanguageStrById(config.Name) .. Language[13128]
|
||||
elseif type == 4 then
|
||||
return VipManager.GetChargedNum() >= value, Language[13129] .. value .. Language[13130]
|
||||
elseif type == 5 then
|
||||
local recharge = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, value)
|
||||
return OperatingManager.IsBuyGift(value), Language[11939] .. recharge.Name .. Language[10777]
|
||||
return OperatingManager.IsBuyGift(value), Language[11939] .. GetLanguageStrById(recharge.Name) .. Language[10777]
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -182,7 +182,7 @@ function FestevalPanel:RefreshSingleData(obj, data)
|
|||
obj.go.gameObject:SetActive(true)
|
||||
local config = ActivityRewardConfig[data.missionId]
|
||||
obj.title.text = string.format(Language[10021], config.Values[1][1])
|
||||
obj.name.text = config.ContentsShow
|
||||
obj.name.text = GetLanguageStrById(config.ContentsShow)
|
||||
obj.itemview:OnOpen(false, config.Reward[1], 1.05, false, false, false, self.sortingOrder)
|
||||
obj.select.gameObject:SetActive(false)
|
||||
obj.gray.gameObject:SetActive(false)
|
||||
|
|
|
@ -349,7 +349,8 @@ function this.RefreshBaseData()
|
|||
this.ArenaName:GetComponent("Text").text = GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.ArenaRoom,
|
||||
baseData.roomId)
|
||||
.ArenaRoomName) --ArenaManager.GetArenaName()
|
||||
this.Integral:GetComponent("Text").text = Language[10111] .. baseData.score .. Language[10112] .. baseData.lvScore
|
||||
this.Integral:GetComponent("Text").text = Language[10111] ..
|
||||
baseData.score .. " " .. Language[10112] .. baseData.lvScore
|
||||
end
|
||||
|
||||
-- 开始计时
|
||||
|
|
|
@ -137,8 +137,8 @@ function SmallSoldierLvInfoPanel:OnShow()
|
|||
|
||||
local qua = 0
|
||||
local priviConfig = ConfigManager.GetConfigData(ConfigName.PrivilegeTypeConfig, 2044)
|
||||
self.curInfo.text = string.format(priviConfig.Name, priviConfig.Condition[curLv][2] / 100)
|
||||
self.nextInfo.text = string.format(priviConfig.Name, priviConfig.Condition[nextLv][2] / 100)
|
||||
self.curInfo.text = string.format(GetLanguageStrById(priviConfig.Name), priviConfig.Condition[curLv][2] / 100)
|
||||
self.nextInfo.text = string.format(GetLanguageStrById(priviConfig.Name), priviConfig.Condition[nextLv][2] / 100)
|
||||
for i = 1, #curConfig.Show do
|
||||
local data = {}
|
||||
data.leftData = {}
|
||||
|
|
|
@ -47,7 +47,7 @@ function this:OnShow(_parent, _Data)
|
|||
sortingOrder = _parent.sortingOrder
|
||||
local args = _Data
|
||||
local helpType = args[1]
|
||||
local str = ConfigManager.TryGetConfigData(ConfigName.QAConfig, helpType).content
|
||||
local str = GetLanguageStrById(ConfigManager.TryGetConfigData(ConfigName.QAConfig, helpType).content)
|
||||
str = string.gsub(str, "{", "<color=#D48A07>")
|
||||
str = string.gsub(str, "}", "</color>")
|
||||
str = string.gsub(str, "|", "\n") --换行
|
||||
|
@ -243,8 +243,8 @@ function this:BuildRateData(actType, UpItem, upItemList)
|
|||
this.ratePreList[n].rate = Util.GetGameObject(this.ratePreList[n].go, "rate"):GetComponent("Text")
|
||||
end
|
||||
this.ratePreList[n].go.gameObject:SetActive(true)
|
||||
this.ratePreList[n].star.text = string.format("<color=#%s>%s</color>", m.color, m.tag)
|
||||
this.ratePreList[n].name.text = string.format("<color=#%s>%s</color>", m.color, m.name)
|
||||
this.ratePreList[n].star.text = string.format("<color=#%s>%s</color>", m.color, GetLanguageStrById(m.tag))
|
||||
this.ratePreList[n].name.text = string.format("<color=#%s>%s</color>", m.color, GetLanguageStrById(m.name))
|
||||
this.ratePreList[n].rate.text = string.format("<color=#%s>", m.color) ..
|
||||
string.format("%.2f", (m.value / 100000) * 100) .. "%</color>"
|
||||
end
|
||||
|
|
|
@ -4,9 +4,9 @@ local this = MonsterCampMainPanel
|
|||
local orginLayer
|
||||
local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup)
|
||||
local monsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig)
|
||||
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting,"Id",0)
|
||||
local campTowerSetting = ConfigManager.GetConfigDataByKey(ConfigName.CampTowerSetting,"Id",1)
|
||||
local trails = {}
|
||||
local attriConfig = ConfigManager.GetConfigDataByKey(ConfigName.GodHoodTreeSetting, "Id", 0)
|
||||
local campTowerSetting = ConfigManager.GetConfigDataByKey(ConfigName.CampTowerSetting, "Id", 1)
|
||||
local trails = {}
|
||||
local redTrailType = {
|
||||
[1] = RedPointType.PersonTrail,
|
||||
[2] = RedPointType.BuddishTrail,
|
||||
|
@ -23,8 +23,8 @@ function MonsterCampMainPanel:InitComponent()
|
|||
this.nextWave = Util.GetGameObject(self.gameObject, "Bg/btnWave")
|
||||
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform)
|
||||
|
||||
for i = 1 ,4 do
|
||||
table.insert(trails,Util.GetGameObject(self.gameObject, "Bg/SiLingDi/trail"..i))
|
||||
for i = 1, 4 do
|
||||
table.insert(trails, Util.GetGameObject(self.gameObject, "Bg/SiLingDi/trail" .. i))
|
||||
end
|
||||
this.btnShenYing = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/shenyingPro")
|
||||
this.btnShenYing:GetComponent("Image").sprite = this.spLoader:LoadSprite("j_jianmushenshu_anniu_02_zh")
|
||||
|
@ -35,27 +35,27 @@ function MonsterCampMainPanel:InitComponent()
|
|||
this.btnShenYing:SetActive(false)
|
||||
this.shenYingProgress:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function MonsterCampMainPanel:BindEvent()
|
||||
Util.AddClick(this.btnBack, function ()
|
||||
Util.AddClick(this.btnBack, function()
|
||||
-- PlayerManager.carbonType = 1
|
||||
self:ClosePanel()
|
||||
end)
|
||||
|
||||
Util.AddClick(this.nextWave, function ()
|
||||
Util.AddClick(this.nextWave, function()
|
||||
JumpManager.GoJump(1011)
|
||||
end)
|
||||
|
||||
Util.AddClick(this.btnShenYing, function ()
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ShenYingShuXing)
|
||||
Util.AddClick(this.btnShenYing, function()
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup, GENERAL_POPUP_TYPE.ShenYingShuXing)
|
||||
end)
|
||||
|
||||
for i = 1 ,#trails do
|
||||
BindRedPointObject(redTrailType[i],Util.GetGameObject(trails[i],"redPoint"))
|
||||
for i = 1, #trails do
|
||||
BindRedPointObject(redTrailType[i], Util.GetGameObject(trails[i], "redPoint"))
|
||||
end
|
||||
|
||||
BindRedPointObject(RedPointType.HeartDemon,Util.GetGameObject(self.gameObject, "Bg/btnWave/redPoint"))
|
||||
BindRedPointObject(RedPointType.HeartDemon, Util.GetGameObject(self.gameObject, "Bg/btnWave/redPoint"))
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
@ -68,7 +68,6 @@ function MonsterCampMainPanel:RemoveListener()
|
|||
Game.GlobalEvent:RemoveEvent(GameEvent.FourEle.RefreshView, this.OnShow)
|
||||
end
|
||||
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function MonsterCampMainPanel:OnOpen(...)
|
||||
SoundManager.PlayMusic(SoundConfig.BGM_Carbon)
|
||||
|
@ -78,25 +77,26 @@ end
|
|||
function MonsterCampMainPanel:OnShow()
|
||||
local totalWaves = MonsterCampManager.GetFourElementTotalWave()
|
||||
local nextWaves = SacredTreeManager.NextAttriFloor()
|
||||
this.waveNum.text = MonsterCampManager.monsterWave..Language[10295]
|
||||
this.waveNum.text = MonsterCampManager.monsterWave .. Language[10295]
|
||||
this.canFightWave.text = MonsterCampManager.monsterWave
|
||||
this.btnShenYingText.text = SacredTreeManager.CulAttri().."/"..#attriConfig.PropertyUnlcokLevels
|
||||
this.shenYingProgressText.text = string.format(Language[11893],totalWaves,nextWaves)
|
||||
this.shenYingProgressIma.fillAmount = totalWaves/nextWaves
|
||||
for i = 1,#trails do
|
||||
this.btnShenYingText.text = SacredTreeManager.CulAttri() .. "/" .. #attriConfig.PropertyUnlcokLevels
|
||||
this.shenYingProgressText.text = string.format(Language[11893], totalWaves, nextWaves)
|
||||
this.shenYingProgressIma.fillAmount = totalWaves / nextWaves
|
||||
for i = 1, #trails do
|
||||
local singleFourElementData = MonsterCampManager.GetCurFourElementMonsterInfo(i)
|
||||
this:SetSingleTrailData(trails[i],singleFourElementData)
|
||||
this:SetSingleTrailData(trails[i], singleFourElementData)
|
||||
end
|
||||
|
||||
local waves = MonsterCampManager.GetFourElementTotalWave()
|
||||
if not PlayerPrefs.HasKey("FourElement"..PlayerManager.uid) then
|
||||
PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,-1)
|
||||
if not PlayerPrefs.HasKey("FourElement" .. PlayerManager.uid) then
|
||||
PlayerPrefs.SetInt("FourElement" .. PlayerManager.uid, -1)
|
||||
end
|
||||
if waves ~= PlayerPrefs.GetInt("FourElement"..PlayerManager.uid) then
|
||||
PlayerPrefs.SetInt("FourElement"..PlayerManager.uid,waves)
|
||||
if waves ~= PlayerPrefs.GetInt("FourElement" .. PlayerManager.uid) then
|
||||
PlayerPrefs.SetInt("FourElement" .. PlayerManager.uid, waves)
|
||||
local propertyId = SacredTreeManager.GetUnLockNewProperty(waves)
|
||||
if propertyId > 0 then
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,nil,nil,nil,CompShowType.fourElement,nil,nil,nil,propertyId)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, nil, nil, nil, CompShowType.fourElement, nil, nil, nil,
|
||||
propertyId)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -104,54 +104,54 @@ end
|
|||
function this:GetOpenTime(id)
|
||||
local str = nil
|
||||
local isFunction = false
|
||||
local config = ConfigManager.GetConfigData(ConfigName.CampTowerSetting,1)
|
||||
if config then
|
||||
for k,v in ipairs(config.CampOpenDay) do
|
||||
local config = ConfigManager.GetConfigData(ConfigName.CampTowerSetting, 1)
|
||||
if config then
|
||||
for k, v in ipairs(config.CampOpenDay) do
|
||||
isFunction = false
|
||||
for n,m in ipairs(v) do
|
||||
if tonumber(n) == 1 and tonumber(m) == id then
|
||||
for n, m in ipairs(v) do
|
||||
if tonumber(n) == 1 and tonumber(m) == id then
|
||||
isFunction = true
|
||||
else
|
||||
if isFunction then
|
||||
if str then
|
||||
str =str.. Language[10382]..NumConvertWeek[tonumber(m)]
|
||||
str = str .. Language[10382] .. NumConvertWeek[tonumber(m)]
|
||||
else
|
||||
str = Language[10383]..NumConvertWeek[tonumber(m)]
|
||||
str = Language[10383] .. NumConvertWeek[tonumber(m)]
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return str
|
||||
end
|
||||
return str
|
||||
end
|
||||
|
||||
function MonsterCampMainPanel:SetSingleTrailData(go,data)
|
||||
function MonsterCampMainPanel:SetSingleTrailData(go, data)
|
||||
local title = Util.GetGameObject(go, "title"):GetComponent("Image")
|
||||
local curwave = Util.GetGameObject(go, "curwave"):GetComponent("Text")
|
||||
local canFightWave = Util.GetGameObject(go, "canFightWave"):GetComponent("Text")
|
||||
local openTime = Util.GetGameObject(go, "openTime"):GetComponent("Text")
|
||||
title.sprite = this.spLoader:LoadSprite(FourElementNameImage[data.fourElementType])
|
||||
curwave.text = (data.monsterWave + 1)..Language[10295]
|
||||
if data.canFightTime >= campTowerSetting.TimesStoreMax then
|
||||
canFightWave.text = string.format("<color=#%s>%s</color>","64450B",data.canFightTime)
|
||||
curwave.text = (data.monsterWave + 1) .. Language[10295]
|
||||
if data.canFightTime >= campTowerSetting.TimesStoreMax then
|
||||
canFightWave.text = string.format("<color=#%s>%s</color>", "64450B", data.canFightTime)
|
||||
else
|
||||
canFightWave.text = string.format("<color=#%s>%s</color>","64450B",data.canFightTime)
|
||||
canFightWave.text = string.format("<color=#%s>%s</color>", "64450B", data.canFightTime)
|
||||
end
|
||||
|
||||
openTime.text = this:GetOpenTime(data.fourElementType)..Language[10353]
|
||||
|
||||
openTime.text = this:GetOpenTime(data.fourElementType) .. Language[10353]
|
||||
Util.SetGray(go, data.openState == 0)
|
||||
Util.AddOnceClick(go,function()
|
||||
Util.AddOnceClick(go, function()
|
||||
if data.openState == 1 then
|
||||
UIManager.OpenPanel(UIName.FourElementMonsterCampPanel,data.fourElementType)
|
||||
UIManager.OpenPanel(UIName.FourElementMonsterCampPanel, data.fourElementType)
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[11894])
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
function MonsterCampMainPanel:OnSortingOrderChange()
|
||||
|
||||
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
|
@ -164,10 +164,10 @@ function MonsterCampMainPanel:OnDestroy()
|
|||
this.spLoader:Destroy()
|
||||
SubUIManager.Close(this.UpView)
|
||||
trails = {}
|
||||
for i = 1 ,#trails do
|
||||
ClearRedPointObject(redTrailType[i],Util.GetGameObject(trails[i],"redPoint"))
|
||||
for i = 1, #trails do
|
||||
ClearRedPointObject(redTrailType[i], Util.GetGameObject(trails[i], "redPoint"))
|
||||
end
|
||||
ClearRedPointObject(RedPointType.HeartDemon,Util.GetGameObject(self.gameObject, "Bg/btnWave/redPoint"))
|
||||
ClearRedPointObject(RedPointType.HeartDemon, Util.GetGameObject(self.gameObject, "Bg/btnWave/redPoint"))
|
||||
end
|
||||
|
||||
return MonsterCampMainPanel
|
||||
return MonsterCampMainPanel
|
||||
|
|
|
@ -77,7 +77,7 @@ function GMChangePanel:InitComponent()
|
|||
for k, v in ConfigPairs(GMInfo) do
|
||||
if v.IsOpen == 1 then
|
||||
local tabBtn = newObjToParent(this.itemPre, this.grid)
|
||||
Util.GetGameObject(tabBtn, "Text"):GetComponent("Text").text = v.Name
|
||||
Util.GetGameObject(tabBtn, "Text"):GetComponent("Text").text = GetLanguageStrById(v.Name)
|
||||
Util.AddClick(tabBtn, function()
|
||||
this.TabBtnOnClick(tabBtn, v)
|
||||
end)
|
||||
|
@ -141,7 +141,7 @@ function this.ShopItemAdapter(shopItem, itemData)
|
|||
if con.ItemType == ItemType.Talisman then
|
||||
itemDes.gameObject:SetActive(true)
|
||||
if con.ItemDescribe then
|
||||
local str = string.split(con.ItemDescribe, ',')
|
||||
local str = string.split(GetLanguageStrById(con.ItemDescribe), ',')
|
||||
if str[1] then
|
||||
itemDes.text = str[1]
|
||||
end
|
||||
|
@ -393,7 +393,7 @@ function this.TabBtnOnClick(btn, config)
|
|||
this.selectBtn.transform:SetParent(btn.gameObject.transform)
|
||||
this.selectBtn.transform.localScale = Vector3.one
|
||||
this.selectBtn.transform.localPosition = Vector3.zero
|
||||
this.selectBtnText.text = config.Name
|
||||
this.selectBtnText.text = GetLanguageStrById(config.Name)
|
||||
--this.UpdateLayout(_level)
|
||||
local dataList = {}
|
||||
local aa = config.Unlock[1]
|
||||
|
@ -432,7 +432,7 @@ function GMChangePanel:SingleTask(go, data, isOpen, tip)
|
|||
limitTxt.gameObject:SetActive(false)
|
||||
priceTxt.gameObject:SetActive(true)
|
||||
if data.PackID ~= 0 and recharge then
|
||||
name.text = recharge.Name
|
||||
name.text = GetLanguageStrById(recharge.Name)
|
||||
priceTxt.gameObject:SetActive(isOpen)
|
||||
limitTxt.gameObject:SetActive(not isOpen)
|
||||
btn:SetActive(isOpen)
|
||||
|
@ -459,7 +459,7 @@ function GMChangePanel:SingleTask(go, data, isOpen, tip)
|
|||
|
||||
priceTxt.text = data.Price[1][2] .. Language[10497]
|
||||
else
|
||||
name.text = data.Name
|
||||
name.text = GetLanguageStrById(data.Name)
|
||||
priceTxt.gameObject:SetActive(false)
|
||||
btn:GetComponent("Button").interactable = true
|
||||
Util.SetGray(btn, false)
|
||||
|
@ -478,7 +478,7 @@ function GMChangePanel:SingleTask(go, data, isOpen, tip)
|
|||
--LogError("data.id=="..data.Id.." data.name=="..data.Type)
|
||||
local des = ""
|
||||
des = data.DisplayReward
|
||||
itemDes.text = des
|
||||
itemDes.text = GetLanguageStrById(des)
|
||||
|
||||
|
||||
Util.AddOnceClick(btn, function()
|
||||
|
|
|
@ -218,7 +218,7 @@ function RecruitEquipPanelNew:UpdataPanel()
|
|||
self:UpdataWishPanel()
|
||||
self:UpdataBoxReward()
|
||||
local num = PrivilegeManager.GetPrivilegeRemainValue(self.singleConfig.MoneyTimes)
|
||||
self.upper.text = string.format(self.config.TitleText,
|
||||
self.upper.text = string.format(GetLanguageStrById(self.config.TitleText),
|
||||
PrivilegeManager.GetPrivilegeUsedTimes(self.singleConfig.MaxTimes),
|
||||
privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2]) --string.format(self.config.TitleText,PrivilegeManager.GetPrivilegeUsedTimes(self.singleConfig.MaxTimes),privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2]..Language[12580]..num) --特权上限
|
||||
self:UpdatePanelData()
|
||||
|
|
|
@ -211,9 +211,10 @@ function RecruitPanelNew:UpdataPanel()
|
|||
self:UpdataWishPanel()
|
||||
self:UpdataBoxReward()
|
||||
num = PrivilegeManager.GetPrivilegeRemainValue(self.singleConfig.MoneyTimes)
|
||||
self.upper.text = string.format(self.config.TitleText,
|
||||
self.upper.text = string.format(GetLanguageStrById(self.config.TitleText),
|
||||
PrivilegeManager.GetPrivilegeUsedTimes(self.singleConfig.MaxTimes),
|
||||
privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2] .. Language[12580] .. num) --特权上限
|
||||
GetLanguageStrById(privilegeConfig[self.singleConfig.MaxTimes].Condition[1][2]) ..
|
||||
" " .. Language[12580] .. num) --特权上限
|
||||
self:UpdatePanelData()
|
||||
self:TimeCountDown()
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue