Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
a46e3263b7
|
@ -159,6 +159,7 @@ function ExploreMainPanel:SetMapData()
|
||||||
if not self.mapList[k] then
|
if not self.mapList[k] then
|
||||||
self.mapList[k] = {}
|
self.mapList[k] = {}
|
||||||
self.mapList[k].go = newObjToParent(self.mapPre,self.mapParent)
|
self.mapList[k].go = newObjToParent(self.mapPre,self.mapParent)
|
||||||
|
self.mapList[k].go.name = "mapPre"..k
|
||||||
self.mapList[k].mapBg = Util.GetGameObject(self.mapList[k].go,"mapBg")
|
self.mapList[k].mapBg = Util.GetGameObject(self.mapList[k].go,"mapBg")
|
||||||
self.mapList[k].mapBgIma = Util.GetGameObject(self.mapList[k].mapBg,"ImgBg"):GetComponent("Image")
|
self.mapList[k].mapBgIma = Util.GetGameObject(self.mapList[k].mapBg,"ImgBg"):GetComponent("Image")
|
||||||
self.mapList[k].mapInfo = Util.GetGameObject(self.mapList[k].go,"mapInfo")
|
self.mapList[k].mapInfo = Util.GetGameObject(self.mapList[k].go,"mapInfo")
|
||||||
|
|
|
@ -154,7 +154,7 @@ function this.ExecuteBehavior(beType, beArgs)
|
||||||
this.button:GetComponent("Button").onClick:RemoveAllListeners()
|
this.button:GetComponent("Button").onClick:RemoveAllListeners()
|
||||||
Util.AddClick(this.button, this.NextGuide)
|
Util.AddClick(this.button, this.NextGuide)
|
||||||
end)
|
end)
|
||||||
if UIManager.IsOpen(UIName.MainPanel) and (string.find(btn.transform.parent.name, "layer") ~= nil or btn.transform.name == "btnXingYunTanBao") then --主界面的ui按钮位置可能会超框,所以做位移处理
|
if UIManager.IsOpen(UIName.MainPanel) and (string.find(btn.transform.parent.name, "layer") ~= nil or btn.transform.name == "btnXingYunTanBao" or btn.transform.name == "btnExplore") then --主界面的ui按钮位置可能会超框,所以做位移处理
|
||||||
for k, v in pairs(MainPanel.operateIcon) do
|
for k, v in pairs(MainPanel.operateIcon) do
|
||||||
if v.go == btn.gameObject then
|
if v.go == btn.gameObject then
|
||||||
MainPanel:SetPosFunc(Vector2.New(v.pos, 0))
|
MainPanel:SetPosFunc(Vector2.New(v.pos, 0))
|
||||||
|
|
|
@ -178,6 +178,7 @@ function this:InitComponent()
|
||||||
[FUNCTION_OPEN_TYPE.tianshumijuan] = this:AddFuncItem(this.btnTianShuMiJuan, -600),
|
[FUNCTION_OPEN_TYPE.tianshumijuan] = this:AddFuncItem(this.btnTianShuMiJuan, -600),
|
||||||
[FUNCTION_OPEN_TYPE.LUCKYTURN] = this:AddFuncItem(this.btnXingYunTanBao, 0),--幸运探宝
|
[FUNCTION_OPEN_TYPE.LUCKYTURN] = this:AddFuncItem(this.btnXingYunTanBao, 0),--幸运探宝
|
||||||
[FUNCTION_OPEN_TYPE.JumpServer] = this:AddFuncItem(this.btnJumpServer, 0),--跨服
|
[FUNCTION_OPEN_TYPE.JumpServer] = this:AddFuncItem(this.btnJumpServer, 0),--跨服
|
||||||
|
[FUNCTION_OPEN_TYPE.Explore] = this:AddFuncItem(this.btnExplore, 0),--探索
|
||||||
}
|
}
|
||||||
|
|
||||||
this.operateNewText = {
|
this.operateNewText = {
|
||||||
|
@ -1289,6 +1290,7 @@ function this.InitFuncShow(funcType)
|
||||||
end
|
end
|
||||||
--(百宝斋,点将台,锻器阁,化虚坛,竞技场,四元阵,灵兽山,送神祠,万象境)
|
--(百宝斋,点将台,锻器阁,化虚坛,竞技场,四元阵,灵兽山,送神祠,万象境)
|
||||||
if funcType then
|
if funcType then
|
||||||
|
if funcType ~= FUNCTION_OPEN_TYPE.Explore then
|
||||||
if this.operateIcon[funcType] then
|
if this.operateIcon[funcType] then
|
||||||
local isOpen = ActTimeCtrlManager.SingleFuncState(funcType)
|
local isOpen = ActTimeCtrlManager.SingleFuncState(funcType)
|
||||||
if funcType == FUNCTION_OPEN_TYPE.ENDLESS then
|
if funcType == FUNCTION_OPEN_TYPE.ENDLESS then
|
||||||
|
@ -1299,8 +1301,10 @@ function this.InitFuncShow(funcType)
|
||||||
this.operateIcon[funcType].open:SetActive(isOpen)
|
this.operateIcon[funcType].open:SetActive(isOpen)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
end
|
||||||
else
|
else
|
||||||
for i, v in pairs(this.operateIcon) do
|
for i, v in pairs(this.operateIcon) do
|
||||||
|
if funcType ~= FUNCTION_OPEN_TYPE.Explore then
|
||||||
local isOpen = ActTimeCtrlManager.SingleFuncState(i)
|
local isOpen = ActTimeCtrlManager.SingleFuncState(i)
|
||||||
if i == FUNCTION_OPEN_TYPE.ENDLESS then
|
if i == FUNCTION_OPEN_TYPE.ENDLESS then
|
||||||
isOpen = ActTimeCtrlManager.IsQualifiled(i)
|
isOpen = ActTimeCtrlManager.IsQualifiled(i)
|
||||||
|
@ -1310,6 +1314,7 @@ function this.InitFuncShow(funcType)
|
||||||
v.open:SetActive(isOpen)
|
v.open:SetActive(isOpen)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
-- 精英怪按钮显隐设置
|
-- 精英怪按钮显隐设置
|
||||||
|
|
Loading…
Reference in New Issue