diff --git a/lua_probject/base_project/Game/View/FamilyViewZuo.lua b/lua_probject/base_project/Game/View/FamilyViewZuo.lua index d111f980..92eccdda 100644 --- a/lua_probject/base_project/Game/View/FamilyViewZuo.lua +++ b/lua_probject/base_project/Game/View/FamilyViewZuo.lua @@ -3,6 +3,7 @@ local FamilyJoinView = import(".FamilyZuo.FamilyJoinView") local FamilyManagerView = import(".FamilyZuo.FamilyManagerView") local FamilyPlayListView = import(".FamilyZuo.FamilyPlayListView") local FamilyRoomCardView = import(".FamilyZuo.FamilyRoomCardView") +local FamilyEventView = import(".FamilyZuo.FamilyEventView") FamilyViewZuo = {} @@ -24,7 +25,7 @@ end function M:init(url) BaseView.InitView(self, url) local view = self._view - + self._mgr_ctr = ControllerManager.GetController(GroupMgrController) --退出按钮 view:GetChild('btn_exit').onClick:Set(function() ViewManager.ChangeView(ViewManager.View_Lobby) @@ -33,7 +34,7 @@ function M:init(url) --亲友圈列表 self._viewList_familyList = view:GetChild('familyList') self._viewList_familyList.itemRenderer = handler(self, self.FamilyListRenderer) - self._viewList_familyList.onClickItem:Set(handler(self,self.ClickFamilyList)) + self._viewList_familyList.onClickItem:Set(handler(self, self.ClickFamilyList)) view:GetController('showList').onChanged:Set(function(context) if context.sender.selectedIndex == 0 then @@ -159,7 +160,7 @@ end --点击切换亲友圈 function M:ClickFamilyList(context) local index = context.sender.selectedIndex - self:EnterFamily(index+1) + self:EnterFamily(index + 1) end --进入亲友圈 @@ -187,6 +188,11 @@ function M:EnterFamily(index_family, only) view:GetChild('text_fangka').text = self._group.groupDiamo self._viewList_familyList.selectedIndex = index_family - 1 self:UpdateRoom() + --初始化事件 + if not self._familyEventView then + self._familyEventView = FamilyEventView.new(self) + self._familyEventView:AddListener() + end end end) end @@ -382,7 +388,6 @@ function M:Show() ViewUtil.ShowModalWait2() self:FillData() - ViewUtil.CloseModalWait2() BaseView.Show(self) diff --git a/lua_probject/base_project/Game/View/FamilyZuo/FamilyEventView.lua b/lua_probject/base_project/Game/View/FamilyZuo/FamilyEventView.lua index a867fcc4..ee776f29 100644 --- a/lua_probject/base_project/Game/View/FamilyZuo/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/FamilyZuo/FamilyEventView.lua @@ -33,7 +33,6 @@ function M:AddListener() mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut)) mgr_ctr:AddEventListener(GroupMgrEvent.OnRefShowStartRoom, handler(self, self._evtOnRefShowStartRoom)) mgr_ctr:AddEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefNotice)) - print("家族添加监听") end function M:RemoveAll() @@ -59,9 +58,6 @@ function M:RemoveAll() mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut)) mgr_ctr:RemoveEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefShowStartRoom)) mgr_ctr:RemoveEventListener(GroupMgrEvent.OnRefNotice, handler(self, self._evtOnRefNotice)) - - - print("家族去除监听") end function M:_evtAddPlay(...) @@ -207,7 +203,6 @@ function M:_evtInviteResponse(...) ) end ) - -- imv:FillData(data) imv:Show() end @@ -243,26 +238,7 @@ function M:_evtOnMemberState(...) return end view:ReflashMember(...) - --[[ - local view = ViewManager.GetCurrenView() - if view.class ~= "FamilyMainView" then - return - end - local arg = { ... } - local group = DataManager.groups:get(view._group.id) - for _, player in pairs(arg[1].offlineUserId) do - group.memberMap[player].online = 0 - end - - for _, player in pairs(arg[1].onlineUserId) do - group.memberMap[player].online = 0 - end - - for _, player in pairs(arg[1].playingUserId) do - group.memberMap[player].playing = "startPlaying" - end - ]] end function M:_evtOnPush_assistant(...) @@ -319,12 +295,7 @@ function M:_evtOnFamilyReflash(...) end if reflashType == "outFamily" then - --local player = DataManager. - --local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈" - --string.format(tips, ) - - --MsgWindow.new(self._root_view, "确定要点过吗？") end if reflashType == "changeJoins" then @@ -344,13 +315,6 @@ function M:_evtOnFamilyReflash(...) end Broadcast.Send(BroadcastEvent.OnJoinsChange) - --[[ - view:ChangeOther() - local win = BaseWindow.FindWindow("FamilyAuditNumber") - if win then - win:Reflash() - end - ]] end end @@ -418,11 +382,6 @@ function M:_evtOnRefShowStartRoom(...) local evt_data = arg[1] - -- local view = ViewManager.GetCurrenView() - -- if view.class ~= "FamilyMainView" then - -- return - -- end - printlog("lingmeng _evtOnRefShowStartRoom", self._group.id, evt_data.groupId) if self._group.id == nil or evt_data.groupId ~= self._group.id then return end @@ -438,7 +397,6 @@ function M:_evtOnRefNotice(...) if view.class ~= "FamilyMainView" then return end - printlog("lingmeng _evtOnRefShowStartRoom", self._group.id, evt_data.groupId) if self._group.id == nil or evt_data.groupId ~= self._group.id then return end diff --git a/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua b/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua index a810be28..45f5a279 100644 --- a/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua +++ b/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerTable.lua @@ -11,24 +11,29 @@ local ManagerMenberChild_JoinsView = import(".ManagerMenberChild_JoinsView") local ManagerMenberChild_ExitsView = import(".ManagerMenberChild_ExitsView") local ManagerMenberChild_DisInviteView = import(".ManagerMenberChild_DisInviteView") local ManagerMenberChild_DisSameDeskView = import(".ManagerMenberChild_DisSameDeskView") +--战绩 +local ManagerRecordChild_BattleStatsView = import(".ManagerRecordChild_BattleStatsView") local FamilyManagerTable = {} local M = FamilyManagerTable M.ManagerTable = { + --管理设置页面 { id = 1, title = "基本设置", view = ManagerChild_SettingView }, { id = 2, title = "成员管理", view = ManagerChild_PlayerView }, { id = 3, title = "快速组局", view = ManagerChild_GamePlayView }, { id = 4, title = "小黑屋管理", view = ManagerChild_BlackView }, - { id = 4, title = "禁止同桌", view = ManagerChild_ForbidSameTableView}, - { id = 4, title = "战绩统计", view = ManagerChild_RecordView}, + { id = 5, title = "禁止同桌", view = ManagerChild_ForbidSameTableView}, + { id = 6, title = "战绩统计", view = ManagerChild_RecordView}, --成员管理页面 - { id = 4, title = "成员列表", view = ManagerMenberChild_PlayerView }, - { id = 5, title = "进驻申请", view = ManagerMenberChild_JoinsView }, - { id = 6, title = "离开申请", view = ManagerMenberChild_ExitsView }, - { id = 7, title = "屏蔽邀请", view = ManagerMenberChild_DisInviteView }, - { id = 8, title = "禁止Ta进房", view = ManagerMenberChild_DisSameDeskView } + { id = 7, title = "成员列表", view = ManagerMenberChild_PlayerView }, + { id = 8, title = "进驻申请", view = ManagerMenberChild_JoinsView }, + { id = 9, title = "离开申请", view = ManagerMenberChild_ExitsView }, + { id = 10, title = "屏蔽邀请", view = ManagerMenberChild_DisInviteView }, + { id = 11, title = "禁止Ta进房", view = ManagerMenberChild_DisSameDeskView }, + --战绩页面 + { id = 12, title = "战绩统计", view = ManagerRecordChild_BattleStatsView }, } M.ManagerShow = { @@ -38,7 +43,13 @@ M.ManagerShow = { } M.ManagerMenberShow = { - { 6,6,7,8,9 }, --群主 + { 7,8,9,10,11 }, --群主 + {}, --代理 + {} --用户 +} + +M.ManagerRecordShow = { + { 12 }, --群主 {}, --代理 {} --用户 } @@ -46,6 +57,7 @@ M.ManagerMenberShow = { M.ManagerManger = { {id=1,url="ui://Family/FamilyManager",table = M.ManagerShow}, {id=2,url="ui://Family/FamilyManagerMenber",table = M.ManagerMenberShow}, + {id=3,url="ui://Family/FamilyManagerRecord",table = M.ManagerManger}, } return M diff --git a/lua_probject/base_project/Game/View/FamilyZuo/ManagerRecordChild_BattleStatsView.lua b/lua_probject/base_project/Game/View/FamilyZuo/ManagerRecordChild_BattleStatsView.lua new file mode 100644 index 00000000..a213ee08 --- /dev/null +++ b/lua_probject/base_project/Game/View/FamilyZuo/ManagerRecordChild_BattleStatsView.lua @@ -0,0 +1,45 @@ +local ManagerRecordChild_BattleStatsView = {} + +local M = ManagerRecordChild_BattleStatsView + +function ManagerRecordChild_BattleStatsView.new(data, callback) + local self = setmetatable({}, { __index = M }) + self.class = "ManagerRecordChild_BattleStatsView" + self._data = data or {} + self._callback = callback + self:init("ui://Family/ManagerRecordChild_BattleStats") + return self +end + +function M:init(url) + local root = self._data.root + if not root then + ViewUtil:ErrorTip("点击太快，请重新打开页面") + return + end + local page = root._view:GetChild('page') + ViewUtil.LoadPage(page, url, function(view) + self._view = view + end) +end + +function M:FillData() + +end + +-- 打开窗口 +function M:Show() + getmetatable(M).__index.Show(self) +end + +-- 关闭窗口 +function M:Close() + getmetatable(M).__index.Close(self) +end + +-- 销毁窗口 +function M:Destroy() + getmetatable(M).__index.Destroy(self) +end + +return M diff --git a/lua_probject/extend_project/extend/poker/sandaha/EXGameController.lua b/lua_probject/extend_project/extend/poker/sandaha/EXGameController.lua index a3185a0d..128b5562 100644 --- a/lua_probject/extend_project/extend/poker/sandaha/EXGameController.lua +++ b/lua_probject/extend_project/extend/poker/sandaha/EXGameController.lua @@ -55,6 +55,7 @@ function M:RegisterEvt() self._eventmap[EXProtocol.GAME_EVT_CARDINHAND] = self.OnPlaySuccCheckHandCard self._eventmap[EXProtocol.EXBomb_Score_New] = self.OnBompScoreNew self._eventmap[EXProtocol.EXCheckCard_Succ] = self.OnCheckCard + self._eventmap[EXProtocol.EXIndex_Jiaofu] = self.OnShowJiaofen end -- function M:Oener(evt_data) @@ -765,4 +766,12 @@ function M:OnCheckCard(evt_data) ) end +function M:OnShowJiaofen(evt_data) + self._cacheEvent:Enqueue( + function() + DispatchEvent(self._dispatcher, EXGameEvent.OnShowJiaofen, evt_data) + end + ) +end + return M diff --git a/lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua b/lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua index 4cb4da63..5e8228d1 100644 --- a/lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua +++ b/lua_probject/extend_project/extend/poker/sandaha/EXGameEvent.lua @@ -21,6 +21,6 @@ local EXGameEvent = { OnPassSuccCheckCard = "OnPassSuccCheckCard", OnBompScoreNew = "OnBompScoreNew", OnCheckCard = "OnCheckCard", - OnJiaofen = "OnJiaofen" + OnShowJiaofen = "OnShowJiaofen" } return EXGameEvent diff --git a/lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua b/lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua index 59201477..ec45f098 100644 --- a/lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua +++ b/lua_probject/extend_project/extend/poker/sandaha/EXMainView.lua @@ -1169,11 +1169,14 @@ function M:EventInit() info._ctr_offline.selectedIndex = p.line_state == 0 and 1 or 0 end ) - _gamectr:AddEventListener(EXGameEvent.OnJiaofen, function(...) + _gamectr:AddEventListener(EXGameEvent.OnShowJiaofen, function(...) local arg = { ... } - local seat = arg[1] - local info = self._player_card_info[self:GetPos(seat)] - info._ctr_jiaofen.selectedIndex = 1 + local data = arg[1] + local index = self:GetPos(data.index) + if index == 1 then + local info = self._player_card_info[self:GetPos(data.index)] + info:ShowJiaofen(data.maxScore) + end end) end diff --git a/lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua index 0dbb1573..e922ddcc 100644 --- a/lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/sandaha/EXPlayerSelfPokerInfoView.lua @@ -94,11 +94,6 @@ function M:init() self._btn_bujiao = self._view:GetChild('btn_bujiao') self._viewList_jiaofen = self._view:GetChild('List_jiaofen') self._viewList_jiaozhu = self._view:GetChild('List_jiaozhu') - - self._viewList_jiaofen.onClickItem:Set(function(context) - self.gameCtr:SendJiaofen(tonumber(context.sender.title)) - self._ctr_jiaofen.selectedIndex = 0 - end) self._btn_bujiao.onClick:Set(function() self.gameCtr:SendJiaofen(0) self._ctr_jiaofen.selectedIndex = 0 @@ -1353,6 +1348,21 @@ function M:CheckOnes(pokerMap) return one_card_list end +function M:ShowJiaofen(Score) + for i = 1, self._viewList_jiaofen.numItems do + local item = self._viewList_jiaofen:GetChildAt(i-1) + item.grayed = tonumber(item.title) >= Score + end + self._viewList_jiaofen.onClickItem:Set(function(context) + if tonumber(context.data.title) >= Score then + return + end + self.gameCtr:SendJiaofen(tonumber(context.data.title)) + self._ctr_jiaofen.selectedIndex = 0 + end) + self._ctr_jiaofen.selectedIndex = 1 +end + function M:Clear() self:PlayScore(nil) self:SetOutCardInfo(nil, false) diff --git a/lua_probject/extend_project/extend/poker/sandaha/EXProtocol.lua b/lua_probject/extend_project/extend/poker/sandaha/EXProtocol.lua index 82633804..fa9153ef 100644 --- a/lua_probject/extend_project/extend/poker/sandaha/EXProtocol.lua +++ b/lua_probject/extend_project/extend/poker/sandaha/EXProtocol.lua @@ -46,6 +46,7 @@ local EXProtocol = { EXJiaofen = "2005", EXJiaofen_Send = "1016", + EXIndex_Jiaofu = "2026", } return EXProtocol diff --git a/wb_new_ui/assets/Common/buttons/ComboBox_Time.xml b/wb_new_ui/assets/Common/buttons/ComboBox_Time.xml new file mode 100644 index 00000000..6748b72f --- /dev/null +++ b/wb_new_ui/assets/Common/buttons/ComboBox_Time.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Common/buttons/ComboBox_Time_item.xml b/wb_new_ui/assets/Common/buttons/ComboBox_Time_item.xml new file mode 100644 index 00000000..ef09e2ed --- /dev/null +++ b/wb_new_ui/assets/Common/buttons/ComboBox_Time_item.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + +