Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
commit
9b72d4d948
|
|
@ -2,10 +2,10 @@
|
||||||
CompoundPanel = Inherit(BasePanel)
|
CompoundPanel = Inherit(BasePanel)
|
||||||
local this = CompoundPanel
|
local this = CompoundPanel
|
||||||
local TabBox = require("Modules/Common/TabBox")
|
local TabBox = require("Modules/Common/TabBox")
|
||||||
local _TabData={ --[1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10385] , funcType = FUNCTION_OPEN_TYPE.COMPOUND},--装备暂时屏蔽
|
local _TabData={ [1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10385] , funcType = FUNCTION_OPEN_TYPE.COMPOUND},
|
||||||
--[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "宝器锻造" },
|
--[2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "宝器锻造" },
|
||||||
[1] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10387] , funcType = FUNCTION_OPEN_TYPE.hunyin},
|
[2] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10387] , funcType = FUNCTION_OPEN_TYPE.hunyin},
|
||||||
[2] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10386], funcType = FUNCTION_OPEN_TYPE.Treasure },
|
[3] = { default = "r_hero_xuanze_002", lock = "r_hero_xuanze_002",select = "r_hero_xuanze_001", name = Language[10386], funcType = FUNCTION_OPEN_TYPE.Treasure },
|
||||||
}
|
}
|
||||||
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||||
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1),
|
select = Color.New(243 / 255, 235 / 255, 202 / 255, 1),
|
||||||
|
|
@ -14,10 +14,10 @@ local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1),
|
||||||
local curIndex = 1
|
local curIndex = 1
|
||||||
|
|
||||||
this.contents = {
|
this.contents = {
|
||||||
--[1] = {view = require("Modules/Compound/view/CompoundPanel_Equip"), panelName = "CompoundPanel_Equip"},--装备暂时屏蔽
|
[1] = {view = require("Modules/Compound/view/CompoundPanel_Equip"), panelName = "CompoundPanel_Equip"},
|
||||||
--[2] = {view = require("Modules/Compound/view/CompoundPanel_Talisman"), panelName = "CompoundPanel_Talisman"},
|
--[2] = {view = require("Modules/Compound/view/CompoundPanel_Talisman"), panelName = "CompoundPanel_Talisman"},
|
||||||
[1] = {view = require("Modules/Compound/view/CompoundPanel_SoulPrint"), panelName = "CompoundPanel_SoulPrint"},
|
[2] = {view = require("Modules/Compound/view/CompoundPanel_SoulPrint"), panelName = "CompoundPanel_SoulPrint"},
|
||||||
[2] = {view = require("Modules/Compound/view/CompoundPanel_Treasure"), panelName = "CompoundPanel_Treasure"},
|
[3] = {view = require("Modules/Compound/view/CompoundPanel_Treasure"), panelName = "CompoundPanel_Treasure"},
|
||||||
}
|
}
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function CompoundPanel:InitComponent()
|
function CompoundPanel:InitComponent()
|
||||||
|
|
@ -49,18 +49,17 @@ function CompoundPanel:BindEvent()
|
||||||
end
|
end
|
||||||
|
|
||||||
function CompoundPanel.RefreshHelpBtn()
|
function CompoundPanel.RefreshHelpBtn()
|
||||||
-- if curIndex==1 then
|
|
||||||
-- this.HelpBtn:SetActive(true)
|
|
||||||
-- Util.AddOnceClick(this.HelpBtn, function()
|
|
||||||
-- UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.EquipCompose,this.helpPosition.x,this.helpPosition.y)
|
|
||||||
-- end)
|
|
||||||
-- else
|
|
||||||
if curIndex==1 then
|
if curIndex==1 then
|
||||||
|
this.HelpBtn:SetActive(true)
|
||||||
|
Util.AddOnceClick(this.HelpBtn, function()
|
||||||
|
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.EquipCompose,this.helpPosition.x,this.helpPosition.y)
|
||||||
|
end)
|
||||||
|
elseif curIndex==2 then
|
||||||
this.HelpBtn:SetActive(true)
|
this.HelpBtn:SetActive(true)
|
||||||
Util.AddOnceClick(this.HelpBtn, function()
|
Util.AddOnceClick(this.HelpBtn, function()
|
||||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.TreasureCompose,this.helpPosition.x,this.helpPosition.y)
|
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.TreasureCompose,this.helpPosition.x,this.helpPosition.y)
|
||||||
end)
|
end)
|
||||||
elseif curIndex==2 then
|
elseif curIndex==3 then
|
||||||
this.HelpBtn:SetActive(true)
|
this.HelpBtn:SetActive(true)
|
||||||
Util.AddOnceClick(this.HelpBtn, function()
|
Util.AddOnceClick(this.HelpBtn, function()
|
||||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.SoulPrintCommond,this.helpPosition.x,this.helpPosition.y)
|
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.SoulPrintCommond,this.helpPosition.x,this.helpPosition.y)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue