diff --git a/Assets/Lua/Managers/LuaGameMgr.lua b/Assets/Lua/Managers/LuaGameMgr.lua index 13ae702e9..43e29f8a2 100644 --- a/Assets/Lua/Managers/LuaGameMgr.lua +++ b/Assets/Lua/Managers/LuaGameMgr.lua @@ -575,4 +575,18 @@ function LuaGameMgr:UIBattle_streamer_act() end end +function LuaGameMgr:EnterLiveRoom(liveRoomId) + + ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom) + self:OpenLoading(Enum.UIPageName.UILoading) + + ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_Loading_Progress, 1) + ManagerContainer.LuaTimerMgr:AddTimer(2000, 1, nil, function() + ManagerContainer.LuaEventMgr:Dispatch(UIEventNames.EID_Loading_Close) + end, nil) + + +end + + return LuaGameMgr \ No newline at end of file diff --git a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua index a3a672ceb..8b4d2dbe3 100644 --- a/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua +++ b/Assets/Lua/UI/UILiveRoom/UILiveRoomView.lua @@ -281,6 +281,10 @@ function UILiveRoomView:OnStreamerGoLoaded(objs) self.OnStreamerGoLoaded) self:InitRoom() self:SetRoomCount(LIVEROOM_NUM) + + ManagerContainer.LuaTimerMgr:AddTimer(500, 1, nil, function() + self.sv_room.loopListView:MovePanelToItemIndex(0, 0) + end, nil) end --region 房间 listview相关 @@ -2033,6 +2037,8 @@ end --region 计时器相关 +local istimerhide=false + function UILiveRoomView:ResetStageTimer(timerVal) self.currStageTimerVal = timerVal if self.currStageTimer then diff --git a/Assets/Lua/UI/UIMain/UIMainView.lua b/Assets/Lua/UI/UIMain/UIMainView.lua index d712353b1..6307ac8d9 100644 --- a/Assets/Lua/UI/UIMain/UIMainView.lua +++ b/Assets/Lua/UI/UIMain/UIMainView.lua @@ -50,7 +50,8 @@ end function UIMainView:AddUIEventListener() ManagerContainer.LuaEventMgr:RegisterUIEvent(self.uiData.name) self.uiBase:AddButtonEventListener(self.btnBack.button, function() - ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom) + --ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom) + ManagerContainer.LuaGameMgr:EnterLiveRoom() end) self.uiBase:AddButtonEventListener(self.btnGold.button, function() @@ -1072,7 +1073,8 @@ end function UIMainView:OnFruitBtn() ManagerContainer.LuaGameMgr:EnterBattle(false) - ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom) + --ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom) + ManagerContainer.LuaGameMgr:EnterLiveRoom() end function UIMainView:OnChallengeBossBtn() @@ -1238,7 +1240,8 @@ function UIMainView:ChangePageMsg(pageType, data) ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIChat, {openMode="chat"}) elseif pageType == Enum.MainViewPageType.Fruit then ManagerContainer.LuaGameMgr:EnterBattle(false); - ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom, data) + --ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UILiveRoom, data) + ManagerContainer.LuaGameMgr:EnterLiveRoom() elseif pageType == Enum.MainViewPageType.XiuLian then ManagerContainer.LuaUIMgr:Open(Enum.UIPageName.UIGoddess, nil, self.uiData.id) elseif pageType == Enum.MainViewPageType.Rank then