diff --git a/lua/app/ui/activity/seven_day/seven_day_ui.lua b/lua/app/ui/activity/seven_day/seven_day_ui.lua index ff2aeddf..4a670af0 100644 --- a/lua/app/ui/activity/seven_day/seven_day_ui.lua +++ b/lua/app/ui/activity/seven_day/seven_day_ui.lua @@ -192,6 +192,7 @@ function SevenDayUI:updateTime() GFunc.centerImgAndTx(self.timeIcon, self.timeTx, 14) end else + UIManager:closeUnderUI(self) self:closeUI() end end diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index b05b8c17..5229aa6f 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -281,18 +281,20 @@ end function MainCityUI:initLeftRightBtns() self.leftNode = self.uiMap["main_ui.left_node"] 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.arrow"] + self.leftArrowBtn = self.uiMap["main_ui.left_node.arrow_node"] self.leftArrowBtn:addClickListener(function() self:openOrCloseLeftSideBar() end) + self.leftArrowImg = self.uiMap["main_ui.left_node.arrow_node.arrow"] + self.rightNode = self.uiMap["main_ui.right_node"] 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.arrow"] + self.rightArrowBtn = self.uiMap["main_ui.right_node.arrow_node"] self.rightArrowBtn:addClickListener(function() self:openOrCloseRightSideBar() end) + self.rightArrowImg = self.uiMap["main_ui.right_node.arrow_node.arrow"] + self.sideBarCellObject = self.uiMap["main_ui.cache_node.side_bar_cell"] local w, h = self.sideBarCellObject:fastGetSizeDelta() self.sideBarHeight = h @@ -401,8 +403,8 @@ function MainCityUI:refreshLeftBtns() end end self.leftSideBar:setSizeDeltaY(-y) - self.leftArrowNode:setLocalScale(1, isClose and -1 or 1, 1) - self.leftArrowNode:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + 20) + self.leftArrowImg:setLocalScale(1, isClose and -1 or 1, 1) + self.leftArrowBtn:setAnchoredPositionY(self.leftSideBar:fastGetAnchoredPositionY() + y + 20) end function MainCityUI:openOrCloseRightSideBar() @@ -466,8 +468,8 @@ function MainCityUI:refreshRightBtns() end end self.rightSideBar:setSizeDeltaY(-y) - self.rightArrowNode:setLocalScale(1, isClose and -1 or 1, 1) - self.rightArrowNode:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + 20) + self.rightArrowImg:setLocalScale(1, isClose and -1 or 1, 1) + self.rightArrowBtn:setAnchoredPositionY(self.rightSideBar:fastGetAnchoredPositionY() + y + 20) end function MainCityUI:clearSideBarList(sideBarList) @@ -695,7 +697,7 @@ function MainCityUI:setLeftSideBarArrowRedPoint(isShow) end if isShow then if ModuleManager.MaincityManager:getIsMainCityLeftSideBarClose() then - self.leftArrowBtn:addRedPoint() + self.leftArrowBtn:addRedPoint(19, 10, 0.6) else self.leftArrowBtn:removeRedPoint() end @@ -710,7 +712,7 @@ function MainCityUI:setRightSideBarArrowRedPoint(isShow) end if isShow then if ModuleManager.MaincityManager:getIsMainCityRightSideBarClose() then - self.rightArrowBtn:addRedPoint() + self.rightArrowBtn:addRedPoint(19, 10, 0.6) else self.rightArrowBtn:removeRedPoint() end diff --git a/lua/app/userdata/activity/seven_day/seven_day_data.lua b/lua/app/userdata/activity/seven_day/seven_day_data.lua index 09b072df..724a1408 100644 --- a/lua/app/userdata/activity/seven_day/seven_day_data.lua +++ b/lua/app/userdata/activity/seven_day/seven_day_data.lua @@ -358,10 +358,12 @@ function SevenDayData:initTaskListener() local nowTime = Time:getServerTime() -- 活动结束就不用监听了 if self.endTime < nowTime then + ModuleManager.TaskManager:unRegisterAllModuleTask("SevenDayData") return false end -- 完成了就不用监听了 if self.collectTaskCount >= self:getSevenDayTaskMaxCount() and self.collectStepCount >= self:getSevenDayRewardMaxCount() then + ModuleManager.TaskManager:unRegisterAllModuleTask("SevenDayData") return false end