zhibo
parent
786c13c8d6
commit
921f999d5b
|
@ -570,6 +570,7 @@ function this.SetCardsData()
|
||||||
for i = 1, 9 do
|
for i = 1, 9 do
|
||||||
if bgListGo[i] then
|
if bgListGo[i] then
|
||||||
local nameGo = Util.GetGameObject(bgListGo[i], "name")
|
local nameGo = Util.GetGameObject(bgListGo[i], "name")
|
||||||
|
--[[
|
||||||
local name = nil
|
local name = nil
|
||||||
for j = 1, #this.choosedList do
|
for j = 1, #this.choosedList do
|
||||||
if this.choosedList[j].position == i then
|
if this.choosedList[j].position == i then
|
||||||
|
@ -584,6 +585,8 @@ function this.SetCardsData()
|
||||||
else
|
else
|
||||||
nameGo:SetActive(false)
|
nameGo:SetActive(false)
|
||||||
end
|
end
|
||||||
|
]]
|
||||||
|
nameGo:SetActive(false)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--Util.GetGameObject(this.gameObject, "RoleGrid/Bg" .. i .. "/name"):SetActive(false)
|
--Util.GetGameObject(this.gameObject, "RoleGrid/Bg" .. i .. "/name"):SetActive(false)
|
||||||
|
|
|
@ -15,9 +15,13 @@ function this.InitData(msg)
|
||||||
--and msg.investigateLevel > 0 or 1
|
--and msg.investigateLevel > 0 or 1
|
||||||
if msg.investigateLevel and msg.investigateLevel > 0 then
|
if msg.investigateLevel and msg.investigateLevel > 0 then
|
||||||
investigateLevel = msg.investigateLevel
|
investigateLevel = msg.investigateLevel
|
||||||
|
--LogError("启明星等级1:"..tostring(investigateLevel))
|
||||||
else
|
else
|
||||||
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.InvestigateCenter) then
|
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.InvestigateCenter) then
|
||||||
investigateLevel = 1
|
investigateLevel = 1
|
||||||
|
--LogError("启明星等级2:"..tostring(investigateLevel))
|
||||||
|
else
|
||||||
|
--LogError("启明星等级3:"..tostring(investigateLevel))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
if investigateLevel > 0 then
|
if investigateLevel > 0 then
|
||||||
|
|
|
@ -94,6 +94,7 @@ local btnImg = {
|
||||||
function FormationCenterPanel:OnShow()
|
function FormationCenterPanel:OnShow()
|
||||||
-- this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
|
-- this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main })
|
||||||
lv = FormationCenterManager.GetInvestigateLevel()
|
lv = FormationCenterManager.GetInvestigateLevel()
|
||||||
|
--LogError("启明星等级4:"..tostring(lv))
|
||||||
local type = investigateConfig[lv].Type
|
local type = investigateConfig[lv].Type
|
||||||
isCanUp = investigateConfig[lv].NextLevel > 0
|
isCanUp = investigateConfig[lv].NextLevel > 0
|
||||||
this.SetBasicInfo(type)
|
this.SetBasicInfo(type)
|
||||||
|
|
|
@ -104,7 +104,8 @@ function this.InitData(guideData)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if openDic[GuideType.Force] ~= -1 then
|
if openDic[GuideType.Force] ~= -1 and GuideConfig[openDic[GuideType.Force]] then
|
||||||
|
--LogError("期望新手:"..tostring(openDic[GuideType.Force]))
|
||||||
local openType = GuideConfig[openDic[GuideType.Force]].OpenType
|
local openType = GuideConfig[openDic[GuideType.Force]].OpenType
|
||||||
local openArgs = GuideConfig[openDic[GuideType.Force]].OpenArgs
|
local openArgs = GuideConfig[openDic[GuideType.Force]].OpenArgs
|
||||||
this.RefreshTriggerListen(openDic[GuideType.Force], openType, openArgs)
|
this.RefreshTriggerListen(openDic[GuideType.Force], openType, openArgs)
|
||||||
|
|
|
@ -3,7 +3,7 @@ local proId = 1--0全部 1机械 2体能 3魔法 4秩序 5混沌 6
|
||||||
local tabs = {}
|
local tabs = {}
|
||||||
local moveIndex = 0
|
local moveIndex = 0
|
||||||
local moveV2 = 0
|
local moveV2 = 0
|
||||||
local handbooklevel = 1
|
local handbooklevel = 2
|
||||||
|
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function this:InitComponent(root)
|
function this:InitComponent(root)
|
||||||
|
|
|
@ -103,7 +103,9 @@ function OperatingPanel:InitComponent()
|
||||||
-- Util.GetGameObject(self.operateTabs[14], "selected/Image"):GetComponent("Image").sprite = Util.LoadSprite(GetPictureFont("X1_zhizunhuiyuan_01"))
|
-- Util.GetGameObject(self.operateTabs[14], "selected/Image"):GetComponent("Image").sprite = Util.LoadSprite(GetPictureFont("X1_zhizunhuiyuan_01"))
|
||||||
-- Util.GetGameObject(self.transform, "bg/pageContent/page_13/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetPictureFont("X1_zhizunhuiyuan_peitu"))
|
-- Util.GetGameObject(self.transform, "bg/pageContent/page_13/icon"):GetComponent("Image").sprite = Util.LoadSprite(GetPictureFont("X1_zhizunhuiyuan_peitu"))
|
||||||
end
|
end
|
||||||
|
function OperatingPanel:OpenOnlineRewards()
|
||||||
|
OnlineRewards:OnShow()
|
||||||
|
end
|
||||||
function OperatingPanel:BindEvent()
|
function OperatingPanel:BindEvent()
|
||||||
Util.AddClick(self.btnBack, function()
|
Util.AddClick(self.btnBack, function()
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||||
|
|
|
@ -64,7 +64,7 @@ function this:OnShow()
|
||||||
PayManager.Pay({Id = allBuyConfig.Id}, function ()
|
PayManager.Pay({Id = allBuyConfig.Id}, function ()
|
||||||
this:OnShow()
|
this:OnShow()
|
||||||
if UIManager.IsOpen(UIName.OperatingPanel) then
|
if UIManager.IsOpen(UIName.OperatingPanel) then
|
||||||
UIManager.GetOpenPanel(UIName.OperatingPanel).OnlineRewards:OnShow()
|
UIManager.GetOpenPanel(UIName.OperatingPanel):OpenOnlineRewards()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
@ -119,7 +119,8 @@ function this.SetItemInfo(go, data)
|
||||||
PayManager.Pay({Id = data.Id}, function ()
|
PayManager.Pay({Id = data.Id}, function ()
|
||||||
this:OnShow()
|
this:OnShow()
|
||||||
if UIManager.IsOpen(UIName.OperatingPanel) then
|
if UIManager.IsOpen(UIName.OperatingPanel) then
|
||||||
UIManager.GetOpenPanel(UIName.OperatingPanel).OnlineRewards:OnShow()
|
--UIManager.GetOpenPanel(UIName.OperatingPanel).OnlineRewards:OnShow()
|
||||||
|
UIManager.GetOpenPanel(UIName.OperatingPanel):OpenOnlineRewards()
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -115,6 +115,9 @@ function RecruitPanel:InitComponent()
|
||||||
this.pre = Util.GetGameObject(this.content,"Pre")--抽卡预设
|
this.pre = Util.GetGameObject(this.content,"Pre")--抽卡预设
|
||||||
|
|
||||||
this.boxBtn = Util.GetGameObject(this.gameObject,"rewardBox/content/Slider/Background/Btn")
|
this.boxBtn = Util.GetGameObject(this.gameObject,"rewardBox/content/Slider/Background/Btn")
|
||||||
|
this.shengxingyulanBtn = Util.GetGameObject(this.gameObject,"HeroStarBtn/Btn")
|
||||||
|
this.shengxingyulanPanel = Util.GetGameObject(this.gameObject,"Shengxingyulan")
|
||||||
|
this.shengxingyulanCloseBtn = Util.GetGameObject(this.gameObject,"Shengxingyulan/CloseBtn")
|
||||||
this.upper = Util.GetGameObject(this.gameObject,"Upper/Num"):GetComponent("Text")--召唤上限
|
this.upper = Util.GetGameObject(this.gameObject,"Upper/Num"):GetComponent("Text")--召唤上限
|
||||||
|
|
||||||
--获取帮助按钮
|
--获取帮助按钮
|
||||||
|
@ -153,6 +156,12 @@ function RecruitPanel:BindEvent()
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||||
RecruitPanel.curIndex=2
|
RecruitPanel.curIndex=2
|
||||||
end)
|
end)
|
||||||
|
Util.AddClick(this.shengxingyulanBtn, function()
|
||||||
|
this.shengxingyulanPanel.gameObject:SetActive(true)
|
||||||
|
end)
|
||||||
|
Util.AddClick(this.shengxingyulanCloseBtn, function()
|
||||||
|
this.shengxingyulanPanel.gameObject:SetActive(false)
|
||||||
|
end)
|
||||||
--宝箱按钮
|
--宝箱按钮
|
||||||
Util.AddClick(this.boxBtn,function()
|
Util.AddClick(this.boxBtn,function()
|
||||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitBox)
|
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitBox)
|
||||||
|
|
Loading…
Reference in New Issue