From d4591f9d941689e0ff07defa55708b761c18314c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Wed, 10 Sep 2025 21:49:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=8E=E5=B7=9D=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base_project/Game/ControllerManager.lua | 6 +- .../extend/majiang/lichuan/EXWitnessView.lua | 73 +++++++++++++----- .../Main_new/Main_new_3_jiangxi.xml | 20 ++--- .../main_majiang/ui/Main_Majiang_fui.bytes | Bin 363987 -> 363992 bytes 4 files changed, 65 insertions(+), 34 deletions(-) diff --git a/lua_probject/base_project/Game/ControllerManager.lua b/lua_probject/base_project/Game/ControllerManager.lua index 2b38dbdc..fe029dd4 100644 --- a/lua_probject/base_project/Game/ControllerManager.lua +++ b/lua_probject/base_project/Game/ControllerManager.lua @@ -30,9 +30,9 @@ function ControllerManager.Init() _controllerMap[GroupMgrController] = GroupMgrController.new() local hostIp = GetGameInfo("login_url") - if(debug_print) then - print("hostIp:::"..hostIp) - end + if (debug_print) then + print("hostIp:::" .. hostIp) + end ControllerManager.WebClient = NetClient.new(hostIp, "majiang", ConnectionProtocol.Web) --ControllerManager.GroupClient = nil--NetClient.new("http://192.168.0.1:8081/", "web_group", ConnectionProtocol.Web) end diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua index c136fa9e..aa0108b9 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua @@ -67,24 +67,46 @@ function M:InitView() self:InitPlayerInfoView() self._player_card_info = {} local _player_card_info = self._player_card_info - for i = 1, #room.player_list do - local p = room.player_list[i] - local index = self:GetPos(p.seat) - print("lingmeng index", index) - local info = self._player_info[index] - local tem = self._view:GetChild("player_card_info" .. index) - _player_card_info[index] = self:NewMJPlayerCardInfoView(tem, index) - local cardInfo = _player_card_info[index] - cardInfo:SetPlayer(p) - cardInfo:UpdateHandCardWitness(false) - cardInfo:UpdateOutCardList(nil, nil, self._cursor) - for i = 1, #p.fz_list do - cardInfo:UpdateFzList(p.fz_list[i], -1) + if room.curren_round > 0 then + for i = 1, #room.room_config.people_num do + local p = room.player_list[i] + local index = self:GetPos(p.seat) + print("lingmeng index", index) + local info = self._player_info[i] + local tem = self._view:GetChild("player_card_info" .. i) + _player_card_info[i] = self:NewMJPlayerCardInfoView(tem, i) + local cardInfo = _player_card_info[i] + cardInfo:SetPlayer(p) + cardInfo:UpdateHandCardWitness(false) + cardInfo:UpdateOutCardList(nil, nil, self._cursor) + for i = 1, #p.fz_list do + cardInfo:UpdateFzList(p.fz_list[i], -1) + end + info:FillData(p) + info._view.visible = false + end + else + for i = 1, room.room_config.people_num do + local tem = self._view:GetChild("player_card_info" .. i) + _player_card_info[i] = self:NewMJPlayerCardInfoView(tem, i) + end + for i = 1, #room.player_list do + local p = room.player_list[i] + local index = self:GetPos(p.seat) + local info = self._player_info[i] + local cardInfo = _player_card_info[index] + cardInfo:SetPlayer(p) + cardInfo:UpdateHandCardWitness(false) + cardInfo:UpdateOutCardList(nil, nil, self._cursor) + for i = 1, #p.fz_list do + cardInfo:UpdateFzList(p.fz_list[i], -1) + end + info:FillData(p) + info._view.visible = true end - info:FillData(p) - info._view.visible = true end + local btn_rule = self._view:GetChild('btn_rule') if btn_rule ~= nil then btn_rule.onClick:Set(function() @@ -146,11 +168,21 @@ function M:EventInit() self:PlayMJSound("user_enter.mp3") local arg = { ... } local p = arg[1] - local info = self._player_info[self:GetPos(p.seat)] - info:FillData(p) - info._view.visible = true - info:SetPlayer(p) - info:FillData() + local info1 = self._player_info[self:GetPos(p.seat)] + info1:FillData(p) + info1._view.visible = true + + local info2 = self._player_card_info[self:GetPos(p.seat)] + info2:SetPlayer(p) + info2:FillData() + end) + + _gamectr:AddEventListener(GameEvent.PlayerLeave, function(...) + local arg = { ... } + local p = arg[1] + local info1 = self._player_info[self:GetPos(p.seat)] + info1._view.visible = false + self:PlayMJSound("user_leave.mp3") end) _gamectr:AddEventListener(GameEvent.WitnessPlayerEnter, function(...) @@ -161,7 +193,6 @@ function M:EventInit() local _room = DataManager.CurrenRoom local viewList_witness = self._view:GetChild('comp_witness'):GetChild('list_players') - print("linemng tcp", _room._flag_updateWitness, #_room.witness_player_list, viewList_witness.numItems) if viewList_witness.numItems == #_room.witness_player_list then viewList_witness:RefreshVirtualList() else diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml index 1ff002c0..4aeb3793 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml @@ -1,8 +1,8 @@ - + - + @@ -35,19 +35,19 @@ - + - +