From b7eafcab26c3a3938d27e5fcf1a7720e30df2ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Fri, 6 Jun 2025 19:48:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=BA=BB=E5=B0=86=E6=96=B0?= =?UTF-8?q?=E6=A1=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/View/Family/FamilyBanDeskmate.lua | 56 ++++++++ .../base_project/Game/View/FamilyView.lua | 13 +- .../RunFast_PlayerSelfPokerInfoView.lua | 2 +- .../Main_new/Main/Component/btn_normol.xml | 10 ++ .../Main_new/Main/Image/Group 255.png | Bin 0 -> 10394 bytes .../Main_new/Main/Image/Group 458.png | Bin 0 -> 9904 bytes .../Main_new/Main/Image/Group 459.png | Bin 0 -> 23195 bytes .../Main_new/Main/Image/Group 460.png | Bin 0 -> 24812 bytes .../Main_new/Main/Image/Union.png | Bin 0 -> 4032 bytes .../Main_new/Main/Image/button_05 1.png | Bin 0 -> 24558 bytes .../Main_new/Main/PlayerHead_1.xml | 14 +- .../Main_new/Main/PlayerHead_2.xml | 14 +- .../Main_new_2/Component/Comp_2_OutCard.xml | 6 +- .../Main_new_2/Player_card_info_2_1.xml | 2 +- .../Main_new_4/Component/Btn_HandCard.xml | 6 +- .../Main_new_4/Component/Comp_4_1_FZ.xml | 14 +- .../Main_new_4/Component/Comp_4_1_FZ_Card.xml | 6 +- .../Main_new_4/Component/Comp_4_2_FZ.xml | 10 +- .../Main_new_4/Component/Comp_4_2_FZ_Card.xml | 10 +- .../Main_new_4/Component/Comp_4_3_FZ.xml | 10 +- .../Main_new_4/Component/Comp_4_3_FZ_Card.xml | 8 +- .../Main_new_4/Component/Comp_4_OutCard2.xml | 8 +- .../Main_new_4/Component/Comp_4_OutCard3.xml | 6 +- .../Main_new_4/Component/Comp_4_OutCard4.xml | 8 +- .../Main_new_4/Component/Comp_HandCard2.xml | 4 +- .../Main_new_4/Component/Comp_HandCard3.xml | 4 +- .../Main_new_4/Component/Comp_HandCard4.xml | 6 +- .../Main_new_4/Player_card_info_1.xml | 16 +-- .../Main_new_4/Player_card_info_2.xml | 18 ++- .../Main_new_4/Player_card_info_3.xml | 22 ++-- .../Main_new_4/Player_card_info_4.xml | 23 ++-- .../Main_new/Main_new_4_jiangxi.xml | 120 +++++++++++------- .../Main_Majiang/images/cards3/1/b201_101.png | Bin 0 -> 29711 bytes .../Main_Majiang/images/cards3/1/b201_102.png | Bin 0 -> 31468 bytes .../Main_Majiang/images/cards3/1/b201_103.png | Bin 0 -> 32177 bytes .../Main_Majiang/images/cards3/1/b201_104.png | Bin 0 -> 32794 bytes .../Main_Majiang/images/cards3/1/b201_105.png | Bin 0 -> 33874 bytes .../Main_Majiang/images/cards3/1/b201_106.png | Bin 0 -> 32433 bytes .../Main_Majiang/images/cards3/1/b201_107.png | Bin 0 -> 31484 bytes .../Main_Majiang/images/cards3/1/b201_108.png | Bin 0 -> 31539 bytes .../Main_Majiang/images/cards3/1/b201_109.png | Bin 0 -> 32771 bytes .../Main_Majiang/images/cards3/1/b201_201.png | Bin 0 -> 33235 bytes .../Main_Majiang/images/cards3/1/b201_202.png | Bin 0 -> 24487 bytes .../Main_Majiang/images/cards3/1/b201_203.png | Bin 0 -> 27255 bytes .../Main_Majiang/images/cards3/1/b201_204.png | Bin 0 -> 31187 bytes .../Main_Majiang/images/cards3/1/b201_205.png | Bin 0 -> 34727 bytes .../Main_Majiang/images/cards3/1/b201_206.png | Bin 0 -> 37234 bytes .../Main_Majiang/images/cards3/1/b201_207.png | Bin 0 -> 33740 bytes .../Main_Majiang/images/cards3/1/b201_208.png | Bin 0 -> 36932 bytes .../Main_Majiang/images/cards3/1/b201_209.png | Bin 0 -> 38676 bytes .../Main_Majiang/images/cards3/1/b201_301.png | Bin 0 -> 39071 bytes .../Main_Majiang/images/cards3/1/b201_302.png | Bin 0 -> 33575 bytes .../Main_Majiang/images/cards3/1/b201_303.png | Bin 0 -> 32429 bytes .../Main_Majiang/images/cards3/1/b201_304.png | Bin 0 -> 34237 bytes .../Main_Majiang/images/cards3/1/b201_305.png | Bin 0 -> 38648 bytes .../Main_Majiang/images/cards3/1/b201_306.png | Bin 0 -> 36085 bytes .../Main_Majiang/images/cards3/1/b201_307.png | Bin 0 -> 42945 bytes .../Main_Majiang/images/cards3/1/b201_308.png | Bin 0 -> 44444 bytes .../Main_Majiang/images/cards3/1/b201_309.png | Bin 0 -> 49198 bytes .../Main_Majiang/images/cards3/1/b201_401.png | Bin 0 -> 29486 bytes .../Main_Majiang/images/cards3/1/b201_402.png | Bin 0 -> 29137 bytes .../Main_Majiang/images/cards3/1/b201_403.png | Bin 0 -> 29492 bytes .../Main_Majiang/images/cards3/1/b201_404.png | Bin 0 -> 27691 bytes .../Main_Majiang/images/cards3/1/b201_501.png | Bin 0 -> 24669 bytes .../Main_Majiang/images/cards3/1/b201_502.png | Bin 0 -> 33718 bytes .../Main_Majiang/images/cards3/1/b201_503.png | Bin 0 -> 22349 bytes .../Main_Majiang/images/cards3/2/b202_101.png | Bin 0 -> 12876 bytes .../Main_Majiang/images/cards3/2/b202_102.png | Bin 0 -> 13654 bytes .../Main_Majiang/images/cards3/2/b202_103.png | Bin 0 -> 13851 bytes .../Main_Majiang/images/cards3/2/b202_104.png | Bin 0 -> 14179 bytes .../Main_Majiang/images/cards3/2/b202_105.png | Bin 0 -> 14632 bytes .../Main_Majiang/images/cards3/2/b202_106.png | Bin 0 -> 13994 bytes .../Main_Majiang/images/cards3/2/b202_107.png | Bin 0 -> 13408 bytes .../Main_Majiang/images/cards3/2/b202_108.png | Bin 0 -> 13533 bytes .../Main_Majiang/images/cards3/2/b202_109.png | Bin 0 -> 14061 bytes .../Main_Majiang/images/cards3/2/b202_201.png | Bin 0 -> 14349 bytes .../Main_Majiang/images/cards3/2/b202_202.png | Bin 0 -> 10073 bytes .../Main_Majiang/images/cards3/2/b202_203.png | Bin 0 -> 11661 bytes .../Main_Majiang/images/cards3/2/b202_204.png | Bin 0 -> 13364 bytes .../Main_Majiang/images/cards3/2/b202_205.png | Bin 0 -> 15187 bytes .../Main_Majiang/images/cards3/2/b202_206.png | Bin 0 -> 16444 bytes .../Main_Majiang/images/cards3/2/b202_207.png | Bin 0 -> 14638 bytes .../Main_Majiang/images/cards3/2/b202_208.png | Bin 0 -> 16104 bytes .../Main_Majiang/images/cards3/2/b202_209.png | Bin 0 -> 16930 bytes .../Main_Majiang/images/cards3/2/b202_301.png | Bin 0 -> 17109 bytes .../Main_Majiang/images/cards3/2/b202_302.png | Bin 0 -> 14342 bytes .../Main_Majiang/images/cards3/2/b202_303.png | Bin 0 -> 13737 bytes .../Main_Majiang/images/cards3/2/b202_304.png | Bin 0 -> 14667 bytes .../Main_Majiang/images/cards3/2/b202_305.png | Bin 0 -> 16753 bytes .../Main_Majiang/images/cards3/2/b202_306.png | Bin 0 -> 15772 bytes .../Main_Majiang/images/cards3/2/b202_307.png | Bin 0 -> 18916 bytes .../Main_Majiang/images/cards3/2/b202_308.png | Bin 0 -> 19603 bytes .../Main_Majiang/images/cards3/2/b202_309.png | Bin 0 -> 21943 bytes .../Main_Majiang/images/cards3/2/b202_401.png | Bin 0 -> 12873 bytes .../Main_Majiang/images/cards3/2/b202_402.png | Bin 0 -> 12691 bytes .../Main_Majiang/images/cards3/2/b202_403.png | Bin 0 -> 12959 bytes .../Main_Majiang/images/cards3/2/b202_404.png | Bin 0 -> 11885 bytes .../Main_Majiang/images/cards3/2/b202_501.png | Bin 0 -> 10466 bytes .../Main_Majiang/images/cards3/2/b202_502.png | Bin 0 -> 14611 bytes .../Main_Majiang/images/cards3/2/b202_503.png | Bin 0 -> 9064 bytes .../Main_Majiang/images/cards3/b202_00.png | Bin 0 -> 5337 bytes .../Main_Majiang/images/cards3/back_201.png | Bin 0 -> 2412 bytes .../Main_Majiang/images/cards3/back_202.png | Bin 0 -> 5337 bytes .../Main_Majiang/images/cards3/back_ce.png | Bin 0 -> 1487 bytes wb_new_ui/assets/Main_Majiang/package.xml | 79 ++++++++++++ .../main_majiang/ui/main_majiang_atlas0.png | Bin 1745594 -> 3051060 bytes .../main_majiang/ui/main_majiang_atlas0_1.png | Bin 4021313 -> 3848477 bytes .../main_majiang/ui/main_majiang_atlas0_2.png | Bin 2810810 -> 2826891 bytes .../main_majiang/ui/main_majiang_atlas0_3.png | Bin 909531 -> 910149 bytes .../main_majiang/ui/main_majiang_fui.bytes | Bin 328525 -> 333371 bytes .../lichuan/ui/Info_MJ_LiChuan_atlas0.png | Bin 58507 -> 58485 bytes .../lichuan/ui/Info_MJ_LiChuan_fui.bytes | Bin 18041 -> 18041 bytes .../ui/Extend_Poker_RunFastNew_fui.bytes | Bin 160468 -> 160468 bytes 113 files changed, 336 insertions(+), 159 deletions(-) create mode 100644 lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Group 255.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Group 458.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Group 459.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Group 460.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/Union.png create mode 100644 wb_new_ui/assets/Main_Majiang/Main_new/Main/Image/button_05 1.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_101.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_102.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_103.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_104.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_105.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_106.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_107.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_108.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_109.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_201.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_202.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_203.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_204.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_205.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_206.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_207.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_208.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_209.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_301.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_302.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_303.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_304.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_305.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_306.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_307.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_308.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_309.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_401.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_402.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_403.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_404.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_501.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_502.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/1/b201_503.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_101.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_102.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_103.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_104.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_105.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_106.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_107.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_108.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_109.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_201.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_202.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_203.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_204.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_205.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_206.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_207.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_208.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_209.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_301.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_302.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_303.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_304.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_305.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_306.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_307.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_308.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_309.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_401.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_402.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_403.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_404.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_501.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_502.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/2/b202_503.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/b202_00.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/back_201.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/back_202.png create mode 100644 wb_new_ui/assets/Main_Majiang/images/cards3/back_ce.png diff --git a/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua b/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua new file mode 100644 index 00000000..2446910b --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua @@ -0,0 +1,56 @@ +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 f87baa4c..12eb3bcb 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -8,6 +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") --- FamilyView = {} @@ -122,7 +123,7 @@ end function M:BanFamily() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_UpdateGroupInfo(self._group.id, name, self._group.name, not self._group.ban, self._group.dissolve_opt, + fgCtr:FG_UpdateGroupInfo(self._group.id, self._group.name, "", not self._group.ban, self._group.dissolve_opt, self._group.kick_opt, self._group.apply, self._group.ban_chat1, self._group.ban_chat2, self._group.option, 0, function(res) if res.ReturnCode ~= 0 then @@ -133,6 +134,10 @@ function M:BanFamily() end) end +function M:BanDeskmate() + self._child_familyAllNumbers = FamilyBanDeskmate.new(self) +end + function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type) local list_familyNumber = self._view:GetChild('list_familyNumber') list_familyNumber:SetVirtual() @@ -162,6 +167,7 @@ function M:ConnetFamilyRoom(fgCtr, id) ViewUtil.ErrorTip(res.ReturnCode, "获取房间列表列表失败") else self:UpdateFamilyRoom(fgCtr, id) + self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0 return 1 end end) @@ -311,8 +317,7 @@ function M:ConnetFamily(index, groups, isCreate) list_family:SetVirtual() self._group = DataManager.groups:get(groups[index].id) self._view:GetChild('text_familyId').text = self._group.id - self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0 - -- print("===================================self._group") + print("===================================self._group") pt(self._group) self._roomNum = self._group.room_num @@ -510,7 +515,7 @@ local MORE_LIST = { }, { name = "禁止同桌", - Fct = M.ShareWx + Fct = M.BanDeskmate }, { name = "关闭聊天室", diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index 549298ce..e899ff4a 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -1024,7 +1024,7 @@ function M:UpdateHandCardsPos() card_view.index = i card_view.btn_card.touchable = true self:UpdateCardMove(card_view.btn_card, false, false) - self:SetBtnCardColor(card_view, 0) + self:SetBtnCardColor(card_view, 1) end end diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml new file mode 100644 index 00000000..4912fd7a --- /dev/null +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml @@ -0,0 +1,10 @@ + + + + + + + + +