diff --git a/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua new file mode 100644 index 00000000..9e0fd2c6 --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua @@ -0,0 +1,57 @@ +--region LOCAL + +local BanDesk = {} +local root = {} +local rootLastIndex = 0 + +local function HideMainView() + rootLastIndex = root.familyType.selectedIndex + root.familyType.selectedIndex = 0 +end + +local function ShowMainView() + root.familyType.selectedIndex = rootLastIndex or 1 +end + +--endregion + +-- 禁止同桌数据 +BanDesk.BanData = {} + +function BanDesk:TryShow(r) + if not self._view then + self:Init() + end + + root = r + HideMainView() + self:Show() +end + +function BanDesk:Close() + BaseView.Close(self) + ShowMainView() +end + +function BanDesk:Init() + setmetatable(BanDesk, {__index = BaseView}) + self:InitView("ui://Family/com_banDesk") + + self.btn_close = self._view:GetChild("btn_close") + self.list_banItem = self._view:GetChild("list_banItem") + + self.btn_close.onClick:Set(function() + self:Close() + end) + + self.list_banItem.itemRenderer = function(index, obj) + local data = self.BanData[index] + + local tex_name = obj:GetChild("tex_name") + local list_BanedPlayers = obj:GetChild("list_BanedPlayers") + local btn_del = obj:GetChild("btn_del") + local btn_addBanItem = obj:GetChild("btn_addBanItem") + end +end + +return BanDesk \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua b/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua deleted file mode 100644 index 2446910b..00000000 --- a/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua +++ /dev/null @@ -1,56 +0,0 @@ -local FamilyNumberDetail = import(".FamilyNumberDetail") - -local FamilyBanDeskmate = {} - -local M = FamilyBanDeskmate - -function FamilyBanDeskmate.new(root) - setmetatable(M, { __index = root }) - local self = setmetatable({}, { __index = M }) - - - local numbers = self._group.members - local fgCtr = ControllerManager.GetController(NewGroupController) - if #numbers == 0 then - ViewUtil.ShowModalWait() - fgCtr:FG_GroupMembers(self._group.id, 0, self._group.total_member_num, false, 1, function(res) - numbers = self._group.members - -- print("==========================res.Data.members") - pt(self._group.members) - ViewUtil:CloseModalWait() - if res.ReturnCode ~= 0 then - ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败") - else - self:GetAllDeskmate(numbers) - end - end) - else - self:GetAllDeskmate(numbers) - end - self:initBtn() - return self -end - -function M:initBtn() - -end - -function M:GetAllDeskmate(numbers) - local fgCtr = ControllerManager.GetController(NewGroupController) - local Deskmate = {} - ViewUtil.ShowModalWait() - for i = 1, #numbers do - fgCtr:FG_GetBanTable(self._group.id, numbers[i].uid, function(res) - if res.ReturnCode == 0 then - - else - ViewUtil.ErrorTip(res.ReturnCode, "获取禁止同桌列表失败！") - end - if i == #numbers then - ViewUtil:CloseModalWait() - end - end) - end -end - -return M diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index aa6d65b0..33873ad2 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -8,7 +8,7 @@ local FamilyAllNumbers = import(".Family.FamilyAllNumbers") local FamilyNumberRecord = import(".Family.FamilyNumberRecord") local FamilyAuditNumber = import(".Family.FamilyAuditNumber") local FamilyJoinAndCreate = import(".Family.FamilyJoinAndCreate") -local FamilyBanDeskmate = import(".Family.FamilyBanDeskmate") +local FamilyBanDesk = import(".Family.FamilyBanDesk") local FamilyMyFamily = import(".Family.FamilyMyFamily") --- FamilyView = {} @@ -141,7 +141,7 @@ function M:BanFamily() end function M:BanDeskmate() - self._child_familyAllNumbers = FamilyBanDeskmate.new(self) + self.FamilyBanDesk = FamilyBanDesk:TryShow(self) end function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type) diff --git a/wb_new_ui/assets/Extend_Poker_ChunTian/package.xml b/wb_new_ui/assets/Extend_Poker_ChunTian/package.xml index 5e4b09d0..3c73cd66 100644 --- a/wb_new_ui/assets/Extend_Poker_ChunTian/package.xml +++ b/wb_new_ui/assets/Extend_Poker_ChunTian/package.xml @@ -622,6 +622,9 @@ + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Extend_Poker_SuoHaNew/package.xml b/wb_new_ui/assets/Extend_Poker_SuoHaNew/package.xml index 141a0de4..192b26bb 100644 --- a/wb_new_ui/assets/Extend_Poker_SuoHaNew/package.xml +++ b/wb_new_ui/assets/Extend_Poker_SuoHaNew/package.xml @@ -533,6 +533,9 @@ + + + \ No newline at end of file diff --git a/wb_new_ui/assets/Family/BanDesk/Component/btn_addBanItem.xml b/wb_new_ui/assets/Family/BanDesk/Component/btn_addBanItem.xml new file mode 100644 index 00000000..eace45d0 --- /dev/null +++ b/wb_new_ui/assets/Family/BanDesk/Component/btn_addBanItem.xml @@ -0,0 +1,10 @@ + + +