副本修改
parent
ca137cd5a5
commit
f223c0c3e1
File diff suppressed because it is too large
Load Diff
|
@ -2343,7 +2343,7 @@
|
||||||
[12342] = "剩余购买次数:",
|
[12342] = "剩余购买次数:",
|
||||||
[12343] = "<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color> ",
|
[12343] = "<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color> ",
|
||||||
[12344] = "<color=#FFDAB6>全公会成员攻击力+ %s ",
|
[12344] = "<color=#FFDAB6>全公会成员攻击力+ %s ",
|
||||||
[12345] = "(%s:%s:%s:后失效)",
|
[12345] = "(%s后失效)",
|
||||||
[12346] = "已击败【%s】!",
|
[12346] = "已击败【%s】!",
|
||||||
[12347] = "即可再抽取",
|
[12347] = "即可再抽取",
|
||||||
[12348] = "青龙秘宝",
|
[12348] = "青龙秘宝",
|
||||||
|
|
|
@ -9,6 +9,7 @@ local cutOpenIndexMonsterConFig
|
||||||
local itemList = {}--优化itemView使用
|
local itemList = {}--优化itemView使用
|
||||||
local sorting = 0
|
local sorting = 0
|
||||||
local curBuyIndex = 0
|
local curBuyIndex = 0
|
||||||
|
local oldSelceParent
|
||||||
this.playerScrollHead={}--滚动条头像
|
this.playerScrollHead={}--滚动条头像
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function GuildTranscriptMainPopup:InitComponent()
|
function GuildTranscriptMainPopup:InitComponent()
|
||||||
|
@ -161,15 +162,10 @@ function GuildTranscriptMainPopup:BindEvent()
|
||||||
local second = msg.nextTime - PlayerManager.serverTime
|
local second = msg.nextTime - PlayerManager.serverTime
|
||||||
if second <= 0 then
|
if second <= 0 then
|
||||||
ChatManager.RequestSendGuildTranscript(function()
|
ChatManager.RequestSendGuildTranscript(function()
|
||||||
-- PopupTipPanel.ShowTip("")
|
|
||||||
end)
|
end)
|
||||||
|
PopupTipPanel.ShowTip("已发送集结公告!")
|
||||||
else
|
else
|
||||||
local day = math.floor(second / (24 * 3600))
|
PopupTipPanel.ShowTip(string.format(Language[12335],TimeToMS(second)))
|
||||||
local minute = math.floor(second / 60) % 60
|
|
||||||
local sec = math.floor(second % 60)
|
|
||||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
|
||||||
local timeStr = string.format(Language[12231], minute, sec)
|
|
||||||
PopupTipPanel.ShowTip(string.format(Language[12335],timeStr))
|
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
@ -265,11 +261,11 @@ function this.SingleChapterDataShow(go,data)
|
||||||
local monsterData = this.GetMonsterConfigDataById(data.MonsterId)
|
local monsterData = this.GetMonsterConfigDataById(data.MonsterId)
|
||||||
if not monsterData then return end
|
if not monsterData then return end
|
||||||
Util.GetGameObject(go,"icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig[monsterData.MonsterId].Icon))
|
Util.GetGameObject(go,"icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(heroConfig[monsterData.MonsterId].Icon))
|
||||||
if cutOpenIndex > data.Id then--已打过
|
if GuildTranscriptManager.GetCurBoss() > data.Id then--已打过
|
||||||
Util.SetGray(go, true)
|
Util.SetGray(go, true)
|
||||||
lock:SetActive(false)
|
lock:SetActive(false)
|
||||||
mask:SetActive(false)
|
mask:SetActive(false)
|
||||||
elseif cutOpenIndex == data.Id then--已开启
|
elseif GuildTranscriptManager.GetCurBoss() == data.Id then--已开启
|
||||||
Util.SetGray(go, false)
|
Util.SetGray(go, false)
|
||||||
lock:SetActive(false)
|
lock:SetActive(false)
|
||||||
mask:SetActive(false)
|
mask:SetActive(false)
|
||||||
|
@ -278,8 +274,10 @@ function this.SingleChapterDataShow(go,data)
|
||||||
lock:SetActive(true)
|
lock:SetActive(true)
|
||||||
mask:SetActive(true)
|
mask:SetActive(true)
|
||||||
end
|
end
|
||||||
if cutOpenIndex == data.Id then
|
if cutOpenIndex == data.Id then
|
||||||
this.SetSelectImagePos(go)
|
this.SetSelectImagePos(go)
|
||||||
|
elseif oldSelceParent == go then
|
||||||
|
this.SelectImage:SetActive(false)
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(Util.GetGameObject(go,"click"),function()
|
Util.AddOnceClick(Util.GetGameObject(go,"click"),function()
|
||||||
if data.Id > GuildTranscriptManager.GetCurBoss() then
|
if data.Id > GuildTranscriptManager.GetCurBoss() then
|
||||||
|
@ -360,6 +358,7 @@ function this.ShowBossInfo()
|
||||||
this.bossHerohpPassText.text = GuildTranscriptManager.GetBlood()/100 .."%"
|
this.bossHerohpPassText.text = GuildTranscriptManager.GetBlood()/100 .."%"
|
||||||
if cutOpenIndex < GuildTranscriptManager.GetCurBoss() then
|
if cutOpenIndex < GuildTranscriptManager.GetCurBoss() then
|
||||||
this.bossHerohpPassText.text = Language[12340]
|
this.bossHerohpPassText.text = Language[12340]
|
||||||
|
this.bossHerohpPass.fillAmount = 0
|
||||||
end
|
end
|
||||||
local liveName = GetResourcePath(curheroConfig.Live)
|
local liveName = GetResourcePath(curheroConfig.Live)
|
||||||
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curheroConfig.Id)
|
local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curheroConfig.Id)
|
||||||
|
@ -499,14 +498,11 @@ function this.RemainTimeDown(_timeTextExpert,timeDown)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function this.TimeStampToDateString(second)
|
function this.TimeStampToDateString(second)
|
||||||
local day = math.floor(second / (24 * 3600))
|
return string.format(Language[12345],TimeToHMS(second))
|
||||||
local minute = math.floor(second / 60) % 60
|
|
||||||
local sec = math.floor( second % 60)
|
|
||||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
|
||||||
return string.format(Language[12345],hour, minute, sec)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.SetSelectImagePos(parent)
|
function this.SetSelectImagePos(parent)
|
||||||
|
oldSelceParent = parent
|
||||||
Util.SetGray(this.SelectImage,false)
|
Util.SetGray(this.SelectImage,false)
|
||||||
this.SelectImage:SetActive(true)
|
this.SelectImage:SetActive(true)
|
||||||
this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform)
|
this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform)
|
||||||
|
|
|
@ -2342,7 +2342,7 @@
|
||||||
12342,剩余购买次数:
|
12342,剩余购买次数:
|
||||||
12343,<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color>
|
12343,<color=#ADADAD>全公会成员攻击力+0%</color><color=#FF0000>(未激活)</color>
|
||||||
12344,<color=#FFDAB6>全公会成员攻击力+ %s
|
12344,<color=#FFDAB6>全公会成员攻击力+ %s
|
||||||
12345,(%s:%s:%s:コ<EFBFBD>ァミァ)
|
12345,(%sコ<73>ァミァ)
|
||||||
12346,已击败【%s】!
|
12346,已击败【%s】!
|
||||||
12347,即可再抽取
|
12347,即可再抽取
|
||||||
12348,青龙秘宝
|
12348,青龙秘宝
|
||||||
|
|
|
Loading…
Reference in New Issue