Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
altair 2020-07-28 23:06:10 +08:00
commit f81db7ac81
19 changed files with 99 additions and 61 deletions

View File

@ -605,9 +605,9 @@ RectTransform:
m_Father: {fileID: 2004788874447248508} m_Father: {fileID: 2004788874447248508}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 117.8, y: -38.17} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 75} m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2897918795683101123 --- !u!222 &2897918795683101123
@ -4495,9 +4495,9 @@ RectTransform:
m_Father: {fileID: 2024422538319681204} m_Father: {fileID: 2024422538319681204}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 75, y: -83.9} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 126, y: 126} m_SizeDelta: {x: 126, y: 126}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6847444274270442713 --- !u!222 &6847444274270442713
@ -4945,7 +4945,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 144.4, y: -1} m_AnchoredPosition: {x: 149, y: -1}
m_SizeDelta: {x: 100, y: 50} m_SizeDelta: {x: 100, y: 50}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2161802867350899703 --- !u!222 &2161802867350899703
@ -12118,9 +12118,9 @@ RectTransform:
m_Father: {fileID: 9126896743726548570} m_Father: {fileID: 9126896743726548570}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 122, y: -38.17} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 75} m_SizeDelta: {x: 75, y: 75}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6335965418662102153 --- !u!222 &6335965418662102153
@ -13807,7 +13807,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &4364234898477055512 --- !u!224 &4364234898477055512
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -15027,9 +15027,9 @@ RectTransform:
m_Father: {fileID: 9126896743726548570} m_Father: {fileID: 9126896743726548570}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 207.33334, y: -38.17} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 75, y: 100} m_SizeDelta: {x: 75, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7070961789110733058 --- !u!222 &7070961789110733058
@ -21235,9 +21235,9 @@ RectTransform:
m_Father: {fileID: 2024422538319681204} m_Father: {fileID: 2024422538319681204}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 75, y: -250.20001} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 123, y: 123} m_SizeDelta: {x: 123, y: 123}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3361903088346078392 --- !u!222 &3361903088346078392
@ -26136,9 +26136,9 @@ RectTransform:
m_Father: {fileID: 2004788874447248508} m_Father: {fileID: 2004788874447248508}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 193.55, y: -38.17} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 76.5, y: 100} m_SizeDelta: {x: 76.5, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &300157243682672950 --- !u!222 &300157243682672950
@ -26529,9 +26529,9 @@ RectTransform:
m_Father: {fileID: 9126896743726548570} m_Father: {fileID: 9126896743726548570}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 39.666668, y: -38.17} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 69, y: 100} m_SizeDelta: {x: 69, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4102564784388293894 --- !u!222 &4102564784388293894
@ -29898,9 +29898,9 @@ RectTransform:
m_Father: {fileID: 2004788874447248508} m_Father: {fileID: 2004788874447248508}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 40.15, y: -38.17} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 80.3, y: 100} m_SizeDelta: {x: 80.3, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8199679755870771298 --- !u!222 &8199679755870771298

View File

@ -279,7 +279,7 @@ function this.InitOption()
this.Option:SetActive(true) this.Option:SetActive(true)
Util.GetGameObject(this.BtnTimeScale, "lock"):SetActive(not BattleManager.IsUnlockBattleSpeed()) Util.GetGameObject(this.BtnTimeScale, "lock"):SetActive(not BattleManager.IsUnlockBattleSpeed())
local IsUnLockBattlePass = BattleManager.IsUnlockBattlePass() --or AppConst.isOpenGM local IsUnLockBattlePass = BattleManager.IsUnlockBattlePass() or (fightType == BATTLE_TYPE.BACK)--or AppConst.isOpenGM
Util.GetGameObject(this.BtnExit, "lock"):SetActive(not IsUnLockBattlePass) Util.GetGameObject(this.BtnExit, "lock"):SetActive(not IsUnLockBattlePass)
if AppConst.isOpenGM then if AppConst.isOpenGM then
Util.GetGameObject(this.BtnGM, "lock"):SetActive(false) Util.GetGameObject(this.BtnGM, "lock"):SetActive(false)

View File

@ -159,8 +159,8 @@ function CarbonTypePanelV2:RemoveListener()
end end
--副本类型 1 综合 2 万象 --副本类型 1 综合 2 万象
function CarbonTypePanelV2:OnOpen(_type) function CarbonTypePanelV2:OnOpen()
carbonType = _type carbonType = PlayerManager.carbonType
LogBlue("carbonType1:"..carbonType) LogBlue("carbonType1:"..carbonType)
if carbonType == 1 then if carbonType == 1 then
-- 清除一下选得副本类型 -- 清除一下选得副本类型
@ -182,6 +182,8 @@ end
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)
function CarbonTypePanelV2:OnShow(...) function CarbonTypePanelV2:OnShow(...)
carbonType = PlayerManager.carbonType
LogBlue("carbonType2:"..carbonType)
this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title) this.title:GetComponent("Image").sprite = Util.LoadSprite(type[carbonType].title)
this.title:GetComponent("RectTransform").localPosition = type[carbonType].titlePos this.title:GetComponent("RectTransform").localPosition = type[carbonType].titlePos
this.title:GetComponent("RectTransform").sizeDelta = type[carbonType].titleSize this.title:GetComponent("RectTransform").sizeDelta = type[carbonType].titleSize
@ -252,6 +254,8 @@ function this.UpdateCarbonContent()
end end
if data.id == -1 then if data.id == -1 then
Util.SetGray(v,true) Util.SetGray(v,true)
elseif data.id == FUNCTION_OPEN_TYPE.CARDELAY then
Util.SetGray(v,not ActTimeCtrlManager.IsQualifiled(data.id))
else else
Util.SetGray(v,not ActTimeCtrlManager.SingleFuncState(data.id)) Util.SetGray(v,not ActTimeCtrlManager.SingleFuncState(data.id))
end end
@ -300,8 +304,8 @@ function this.BtnClick(id)
PopupTipPanel.ShowTip(Language[10327]) PopupTipPanel.ShowTip(Language[10327])
return return
end end
if ActTimeCtrlManager.SingleFuncState(id) then if ActTimeCtrlManager.IsQualifiled(id) then
UIManager.OpenPanel(UIName.GuildCarDelayMainPanel) UIManager.OpenPanel(UIName.GuildCarDelayMainPanel)
else else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id))
end end
@ -402,7 +406,7 @@ function CarbonTypePanelV2:OnClose()
this.refreshTimer = nil this.refreshTimer = nil
end end
this.isPlayDoorAudio = false this.isPlayDoorAudio = false
carbons = {} carbonType = 0
end end
--界面销毁时调用(用于子类重写) --界面销毁时调用(用于子类重写)
@ -411,6 +415,8 @@ function CarbonTypePanelV2:OnDestroy()
if this.BtView then if this.BtView then
SubUIManager.Close(this.BtView) SubUIManager.Close(this.BtView)
end end
carbons = {}
this.playerHead=nil
end end
return CarbonTypePanelV2 return CarbonTypePanelV2

View File

@ -14,11 +14,11 @@ local carbonIndex=0--副本索引
--顶部背景图 --顶部背景图
local titleBg={ local titleBg={
[1]={bg="r_richang_banner_5",titleTip = specialConfig[45].Value,pos = Vector3.New(257.08,658.37,0)}, [1]={bg="r_richang_banner_5",titleTip = specialConfig[41].Value,pos = Vector3.New(257.08,658.37,0)},
[2]={bg="r_richang_banner_4",titleTip = specialConfig[44].Value,pos = Vector3.New(257.08,651.24,0)}, [2]={bg="r_richang_banner_4",titleTip = specialConfig[42].Value,pos = Vector3.New(257.08,651.24,0)},
[3]={bg="r_richang_banner_3",titleTip = specialConfig[43].Value,pos = Vector3.New(257.08,658.37,0)}, [3]={bg="r_richang_banner_3",titleTip = specialConfig[43].Value,pos = Vector3.New(257.08,658.37,0)},
[4]={bg="r_richang_banner_2",titleTip = specialConfig[42].Value,pos = Vector3.New(257.08,651.24,0)}, [4]={bg="r_richang_banner_2",titleTip = specialConfig[44].Value,pos = Vector3.New(257.08,651.24,0)},
[5]={bg="r_richang_banner_1",titleTip = specialConfig[41].Value,pos = Vector3.New(257.08,651.24,0)}, [5]={bg="r_richang_banner_1",titleTip = specialConfig[45].Value,pos = Vector3.New(257.08,651.24,0)},
} }
--难度图片 --难度图片
local qualityBg={ local qualityBg={

View File

@ -50,7 +50,8 @@ function EndLessCarbonPanel:BindEvent()
Util.AddClick(this.btnBack, function () Util.AddClick(this.btnBack, function ()
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面, -- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错 -- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1) PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
--检测到上一个面板打开之后,关闭自己 --检测到上一个面板打开之后,关闭自己
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function() CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()

View File

@ -84,7 +84,8 @@ function PlotCarbonPanel:BindEvent()
ClearRedPointObject(RedPointType.EpicExplore_GetReward) ClearRedPointObject(RedPointType.EpicExplore_GetReward)
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面, -- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错 -- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
UIManager.OpenPanel(UIName.CarbonTypePanelV,1) PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV)
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function() CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
UIManager.ClosePanel(UIName.PlotCarbonPanel) UIManager.ClosePanel(UIName.PlotCarbonPanel)
end) end)

View File

@ -51,7 +51,8 @@ function TrialCarbonPanel:BindEvent()
ClearRedPointObject(RedPointType.EpicExplore_GetReward) ClearRedPointObject(RedPointType.EpicExplore_GetReward)
-- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面, -- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面,
-- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错 -- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1) PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function() CallBackOnPanelOpen(UIName.CarbonTypePanelV2, function()
UIManager.ClosePanel(UIName.TrialCarbonPanel) UIManager.ClosePanel(UIName.TrialCarbonPanel)
end) end)

View File

@ -477,11 +477,12 @@ function this.RemainTimeDown()
end end
function this.RefreshPanelShowByState() function this.RefreshPanelShowByState()
if ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then if ExpeditionManager.ExpeditionPanelIsOpen == 1 and UIManager.IsOpen(UIName.ExpeditionMainPanel) then --not UIManager.IsOpen(UIName.BattlePanel) then
PlayerManager.carbonType = 1
if ExpeditionManager.ExpeditionState == 2 then if ExpeditionManager.ExpeditionState == 2 then
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1) UIManager.OpenPanel(UIName.CarbonTypePanelV2)
PopupTipPanel.ShowTip(Language[12195]) PopupTipPanel.ShowTip(Language[12195])
elseif ExpeditionManager.ExpeditionState == 3 then elseif ExpeditionManager.ExpeditionState == 3 then
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1) UIManager.OpenPanel(UIName.CarbonTypePanelV2)
PopupTipPanel.ShowTip(Language[12195]) PopupTipPanel.ShowTip(Language[12195])
end end
end end

View File

@ -308,9 +308,18 @@ function this.GetElementIndex(curFormation)
local waterElementNum = 0 local waterElementNum = 0
local groundElementNum = 0 local groundElementNum = 0
for i = 1, #curFormation do--将所有元素信息存入列表 for _,go in pairs(curFormation) do--将所有元素信息存入列表
local heroPropertyType = HeroManager.GetSingleHeroData(curFormation[i].heroId).heroConfig.PropertyName if go and go.heroId then
table.insert(elementPropertyList, heroPropertyType) local temp = HeroManager.GetSingleHeroData(go.heroId)
if not temp then
LogGreen(go.heroId.."这个英雄不存在")
else
local heroPropertyType = temp.heroConfig.PropertyName
table.insert(elementPropertyList, heroPropertyType)
end
else
LogGreen(_.."这个编队的这个英雄不存在")
end
end end
for i, v in pairs(elementPropertyList) do--遍历该列表拿筛选出各元素 for i, v in pairs(elementPropertyList) do--遍历该列表拿筛选出各元素
if (v == 1) then if (v == 1) then

View File

@ -861,10 +861,10 @@ function this.SetOneKeyGo()
-- else -- else
-- return aWarPower>bWarPower -- return aWarPower>bWarPower
-- end -- end
if a.warPower == b.bWarPower then if a.warPower == b.warPower then
return a.id>b.id return a.id>b.id
else else
return a.aWarPower > b.bWarPower return a.warPower > b.warPower
end end
end) end)
--遍历英雄 去除已上阵英雄 --遍历英雄 去除已上阵英雄

View File

@ -91,6 +91,11 @@ function this.SetCardSingleData(go,monsterId,_pos)
pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) pro.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
SetCardStars(starGrid,heroConfig.Star) SetCardStars(starGrid,heroConfig.Star)
if heroConfig.Star > 9 then
Util.GetGameObject(go,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
else
Util.GetGameObject(go,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)
end
name.text=heroConfig.ReadingName name.text=heroConfig.ReadingName
end end
--界面关闭时调用(用于子类重写) --界面关闭时调用(用于子类重写)

View File

@ -119,11 +119,6 @@ function this.SingleInfoDataShow(go,data)
Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(curHeroConfig.Icon)) Util.GetGameObject(heroGo, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(curHeroConfig.Icon))
Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroConfig.Star)) Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(curHeroConfig.Star))
SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), data.teamInfo[i].star) SetHeroStars(Util.GetGameObject(heroGo, "starGrid"), data.teamInfo[i].star)
if heroConfig.Star > 9 then
Util.GetGameObject(go,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(true)
else
Util.GetGameObject(go,"UI_Effect_jinkuang_KaPai").gameObject:SetActive(false)
end
Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text=data.teamInfo[i].level Util.GetGameObject(heroGo, "lvbg/levelText"):GetComponent("Text").text=data.teamInfo[i].level
local heroData = {} local heroData = {}
Util.AddOnceClick(Util.GetGameObject(Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"), "frame"), function() Util.AddOnceClick(Util.GetGameObject(Util.GetGameObject(curHeroGoList[data.teamInfo[i].position], "frame"), "frame"), function()

View File

@ -654,7 +654,8 @@ function this:BindEvent()
end) end)
Util.AddClick(this.btnColorfulWorld, function() Util.AddClick(this.btnColorfulWorld, function()
if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then
UIManager.OpenPanel(UIName.CarbonTypePanelV2,2) PlayerManager.carbonType = 2
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
else else
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL)) PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.TRIAL))
end end
@ -1303,11 +1304,14 @@ function this.TimeFormat()
--轮转活动,乾坤宝盒 --轮转活动,乾坤宝盒
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
info = info.endTime - PlayerManager.serverTime if info then
info = math.floor(info/86400) info = info.endTime - PlayerManager.serverTime
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) then info = math.floor(info/86400)
this.DynamicActivityTime.text = info.."" if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) then
this.DynamicActivityTime.text = info..""
end
end end
end end
--为限时折扣写的 --为限时折扣写的
function this:GetInfoList() function this:GetInfoList()

View File

@ -49,7 +49,8 @@ end
function MonsterCampPanel:BindEvent() function MonsterCampPanel:BindEvent()
Util.AddClick(this.btnBack, function () Util.AddClick(this.btnBack, function ()
-- UIManager.OpenPanel(UIName.MainPanel) -- UIManager.OpenPanel(UIName.MainPanel)
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1) PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
self:ClosePanel() self:ClosePanel()
end) end)

View File

@ -224,16 +224,29 @@ end
function QianKunBox:timeCountDown() function QianKunBox:timeCountDown()
local timeDown=CalculateSecondsNowTo_N_OClock(5)--领取按钮的倒计时 local timeDown=CalculateSecondsNowTo_N_OClock(5)--领取按钮的倒计时
self.btnTime.text = TimeToHMS(timeDown) self.btnTime.text = TimeToHMS(timeDown)
self.shopData = ShopManager.GetShopDataByType(SHOP_TYPE.QIANKUNBOX_SHOP)--获取活动信息 -- self.shopData = ShopManager.GetShopDataByType(SHOP_TYPE.QIANKUNBOX_SHOP)--获取活动信息
self.leftUpTime.text = TimeToDH(self.shopData.endTime - GetTimeStamp())--活动结束的倒计时 self.shopData =ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox)
self.leftUpTime.text = self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime)--活动结束的倒计时
self.timer = Timer.New(function() self.timer = Timer.New(function()
self.leftUpTime.text = TimeToDH(self.shopData.endTime - GetTimeStamp()) self.leftUpTime.text = self:TimeToDHMS(self.shopData.endTime - PlayerManager.serverTime)
self.btnTime.text = TimeToHMS(timeDown) self.btnTime.text = TimeToHMS(timeDown)
timeDown = timeDown -1 timeDown = timeDown -1
end, 1, -1, true) end, 1, -1, true)
self.timer:Start() self.timer:Start()
end end
--- 将一段时间转换为天时分秒
function QianKunBox:TimeToDHMS(second)
local day = math.floor(second / (24 * 3600))
local minute = math.floor(second / 60) % 60
local sec = second % 60
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
if day <= 0 and hour <= 0 then
return string.format(Language[12231],minute, sec)
else
return string.format(Language[12232],day, hour)
end
end
function QianKunBox:refreshMagicNum() function QianKunBox:refreshMagicNum()
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox) local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.QianKunBox)

View File

@ -74,7 +74,8 @@ function this:OpenJieling()
end end
-- 打开副本选择界面 -- 打开副本选择界面
function this:OpenCarbon() function this:OpenCarbon()
UIManager.OpenPanel(UIName.CarbonTypePanelV2,1) PlayerManager.carbonType = 1
UIManager.OpenPanel(UIName.CarbonTypePanelV2)
end end
function this:OpenGuild() function this:OpenGuild()
JumpManager.GoJump(4001) JumpManager.GoJump(4001)