From 744531d94232bd9fd261ed189508913b9f840c0c 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, 9 Apr 2025 10:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E6=9D=A0=E7=89=8C=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E4=B8=89=E4=B8=AA=E9=BA=BB=E5=B0=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../majiang/fuzhou/EXGameController.lua | 2 +- .../extend/majiang/jinxi/EXGameController.lua | 2 +- .../majiang/lichuan/EXGameController.lua | 2 +- .../extend/majiang/lichuan/EXMainView.lua | 23 +++++++++--------- .../main/majiang/MJPlayerCardInfoView.lua | 1 + .../main_majiang/ui/main_majiang_fui.bytes | Bin 247948 -> 247949 bytes 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua index 6b8e0459..24dbfe48 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXGameController.lua @@ -76,7 +76,7 @@ end function M:OnEventBuGang(evt_data) printlog("OnEventBuGang") pt(evt_data) - DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"][1], evt_data["info"][2], true) + DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"], true) end -- 发送放子选择到服务器 diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua index cf8bb7b1..7fe16110 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXGameController.lua @@ -77,7 +77,7 @@ end function M:OnEventBuGang(evt_data) printlog("OnEventBuGang") pt(evt_data) - DispatchEvent(self._dispatcher,TX_GameEvent.EventBuGang,evt_data["info"][1],evt_data["info"][2],true ) + DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"], true) end -- 发送放子选择到服务器 diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua index bfb85907..6f5335d2 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXGameController.lua @@ -76,7 +76,7 @@ end function M:OnEventBuGang(evt_data) printlog("OnEventBuGang") pt(evt_data) - DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"][1], evt_data["info"][2], true) + DispatchEvent(self._dispatcher, TX_GameEvent.EventBuGang, evt_data["info"], true) end -- 发送放子选择到服务器 diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index c6f7abc0..8d647acd 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -45,19 +45,20 @@ function M:InitView(url) end end -function M:__BuGang(card1, card2, callback) +function M:__BuGang(cardInfo, callback) local _gang_tip_choice = UIPackage.CreateObject("Extend_MJ_LiChuan", "Gang_tip_choice") _gang_tip_choice.visible = true - local gangcard1 = _gang_tip_choice:GetChild("card1") - local gangcard2 = _gang_tip_choice:GetChild("card2") - - - gangcard1.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. card1) - gangcard2.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. card2) - - gangcard1.onClick:Add(function() - callback(card1) + local list_card = _gang_tip_choice:GetChild("list_card") + list_card:SetVirtual() + list_card.itemRenderer = function(index, obj) + obj.icon = UIPackage.GetItemURL("Main_Majiang", self:GetPrefix() .. "202_" .. cardInfo[index + 1]) + end + list_card.numItems = #cardInfo + list_card.onClickItem:Set(function(context) + local item = context.data + local index = list:GetChildIndex(item) + callback(cardInfo[index + 1]) end) gangcard2.onClick:Add(function() @@ -141,7 +142,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.EventBuGang, function(...) local arg = { ... } - self:__BuGang(arg[1], arg[2], + self:__BuGang(arg[1], function(id) printlog(id) _gamectr:SendGangCard(id) diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index f2ba8588..f6b3a925 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -385,6 +385,7 @@ function M:UpdateFzList(fz, index, show_card) end local obj = UIPackage.CreateObjectFromURL('ui://Main_Majiang/' .. comp) + print("============================================pengpengpeng", comp) local _area_fz_list = self._area_fz_list local _area_outcard_list = self._area_outcard_list diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes index e9722c51785db202cd6f098be47d8154d517c9a2..d47914c88a3719c9f3d3f461d3c68fb88f1da446 100644 GIT binary patch delta 46 zcmeB~$lp7WzoCV(g=q_O@e)SW=?iO_Q`xgJ6Z6t5GN&)7VAhzfTgU9TJ#;CvxiSEZ C4G>}g delta 36 scmeC3$lo)OzoCV(g=q_O@e)Rr=?iO_Q`xgJ6Z6t5GPgfm!n{Tq0Qfr%^Z)<=