puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.juzugame.com/b6-client/b6-lua into dev

Browse Source
This commit is contained in:
xiekaidong 2023-05-26 17:14:19 +08:00
commit 944dfd1b5f
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua/app/ui/activity/seven_day/seven_day_ui.lua
View File

@ -192,6 +192,7 @@ function SevenDayUI:updateTime()
GFunc.centerImgAndTx(self.timeIcon, self.timeTx, 14) GFunc.centerImgAndTx(self.timeIcon, self.timeTx, 14)
end end
else else
UIManager:closeUnderUI(self)
self:closeUI() self:closeUI()
end end
end end

22
lua/app/ui/main_city/main_city_ui.lua
View File

@ -281,18 +281,20 @@ end
function MainCityUI:initLeftRightBtns() function MainCityUI:initLeftRightBtns()
self.leftNode = self.uiMap["main_ui.left_node"] self.leftNode = self.uiMap["main_ui.left_node"]
self.leftSideBar = self.uiMap["main_ui.left_node.side_bar"] self.leftSideBar = self.uiMap["main_ui.left_node.side_bar"]
self.leftArrowNode = self.uiMap["main_ui.left_node.arrow_node"] self.leftArrowBtn = self.uiMap["main_ui.left_node.arrow_node"]
self.leftArrowBtn = self.uiMap["main_ui.left_node.arrow_node.arrow"]
self.leftArrowBtn:addClickListener(function() self.leftArrowBtn:addClickListener(function()
self:openOrCloseLeftSideBar() self:openOrCloseLeftSideBar()
end) end)
self.leftArrowImg = self.uiMap["main_ui.left_node.arrow_node.arrow"]
self.rightNode = self.uiMap["main_ui.right_node"] self.rightNode = self.uiMap["main_ui.right_node"]
self.rightSideBar = self.uiMap["main_ui.right_node.side_bar"] self.rightSideBar = self.uiMap["main_ui.right_node.side_bar"]
self.rightArrowNode = self.uiMap["main_ui.right_node.arrow_node"] self.rightArrowBtn = self.uiMap["main_ui.right_node.arrow_node"]
self.rightArrowBtn = self.uiMap["main_ui.right_node.arrow_node.arrow"]
self.rightArrowBtn:addClickListener(function() self.rightArrowBtn:addClickListener(function()
self:openOrCloseRightSideBar() self:openOrCloseRightSideBar()
end) end)
self.rightArrowImg = self.uiMap["main_ui.right_node.arrow_node.arrow"]
self.sideBarCellObject = self.uiMap["main_ui.cache_node.side_bar_cell"] self.sideBarCellObject = self.uiMap["main_ui.cache_node.side_bar_cell"]
local w, h = self.sideBarCellObject:fastGetSizeDelta() local w, h = self.sideBarCellObject:fastGetSizeDelta()
self.sideBarHeight = h self.sideBarHeight = h
@ -401,8 +403,8 @@ function MainCityUI:refreshLeftBtns()
end end
end end
self.leftSideBar:setSizeDeltaY(-y) self.leftSideBar:setSizeDeltaY(-y)
self.leftArrowNode:setLocalScale(1, isClose and -1 or 1, 1) self.leftArrowImg:setLocalScale(1, isClose and -1 or 1, 1)
self.leftArrowNode:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + 20) self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + 20)
end end
function MainCityUI:openOrCloseRightSideBar() function MainCityUI:openOrCloseRightSideBar()
@ -466,8 +468,8 @@ function MainCityUI:refreshRightBtns()
end end
end end
self.rightSideBar:setSizeDeltaY(-y) self.rightSideBar:setSizeDeltaY(-y)
self.rightArrowNode:setLocalScale(1, isClose and -1 or 1, 1) self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1)
self.rightArrowNode:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + 20) self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + 20)
end end
function MainCityUI:clearSideBarList(sideBarList) function MainCityUI:clearSideBarList(sideBarList)
@ -695,7 +697,7 @@ function MainCityUI:setLeftSideBarArrowRedPoint(isShow)
end end
if isShow then if isShow then
if ModuleManager.MaincityManager:getIsMainCityLeftSideBarClose() then if ModuleManager.MaincityManager:getIsMainCityLeftSideBarClose() then
self.leftArrowBtn:addRedPoint() self.leftArrowBtn:addRedPoint(19, 10, 0.6)
else else
self.leftArrowBtn:removeRedPoint() self.leftArrowBtn:removeRedPoint()
end end
@ -710,7 +712,7 @@ function MainCityUI:setRightSideBarArrowRedPoint(isShow)
end end
if isShow then if isShow then
if ModuleManager.MaincityManager:getIsMainCityRightSideBarClose() then if ModuleManager.MaincityManager:getIsMainCityRightSideBarClose() then
self.rightArrowBtn:addRedPoint() self.rightArrowBtn:addRedPoint(19, 10, 0.6)
else else
self.rightArrowBtn:removeRedPoint() self.rightArrowBtn:removeRedPoint()
end end

2
lua/app/userdata/activity/seven_day/seven_day_data.lua
View File

@ -358,10 +358,12 @@ function SevenDayData:initTaskListener()
local nowTime = Time:getServerTime() local nowTime = Time:getServerTime()
-- 活动结束就不用监听了 -- 活动结束就不用监听了
if self.endTime < nowTime then if self.endTime < nowTime then
ModuleManager.TaskManager:unRegisterAllModuleTask("SevenDayData")
return false return false
end end
-- 完成了就不用监听了 -- 完成了就不用监听了
if self.collectTaskCount >= self:getSevenDayTaskMaxCount() and self.collectStepCount >= self:getSevenDayRewardMaxCount() then if self.collectTaskCount >= self:getSevenDayTaskMaxCount() and self.collectStepCount >= self:getSevenDayRewardMaxCount() then
ModuleManager.TaskManager:unRegisterAllModuleTask("SevenDayData")
return false return false
end end