From b86601898b2d8d4c4f15118955283d505b050e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Tue, 22 Apr 2025 20:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=8E=E5=B7=9D=E4=BA=8C=E4=BA=BA=EF=BC=8C?= =?UTF-8?q?=E5=9B=9B=E4=BA=BA=E8=87=AA=E5=8A=A8=E5=B8=83=E5=B1=80=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lichuan/MJPlayerCardInfoView_jiangxi.lua | 12 +++---- .../MJPlayerSelfCardInfoView_jiangxi.lua | 34 ++++++++++++++---- .../main/majiang/MJPlayerCardInfoView.lua | 3 ++ .../main_majiang/ui/main_majiang_fui.bytes | Bin 311743 -> 311792 bytes 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerCardInfoView_jiangxi.lua b/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerCardInfoView_jiangxi.lua index 89c9beda..72a6b7e7 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerCardInfoView_jiangxi.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerCardInfoView_jiangxi.lua @@ -129,15 +129,13 @@ function M:UpdateHandCard(getcard, mp) getcard = getcard or false mp = mp or false + self._view_handCardList:RemoveChildren() for i = 0, self._player.hand_left_count - 1 do - if getcard and i == self._player.hand_left_count - 1 then - self._ctr_getCard.selectedIndex = 1 - else - if i >= self._view_handCardList.numItems then - self._view_handCardList:AddItemFromPool() - end - end + -- if i >= self._view_handCardList.numItems then + self._view_handCardList:AddItemFromPool() + -- end end + self._ctr_getCard.selectedIndex = getcard and 1 or 0 end -- 获取麻将图片资源位置，可以在扩展中复写 diff --git a/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView_jiangxi.lua b/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView_jiangxi.lua index fe5b9696..3a3f6232 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView_jiangxi.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/MJPlayerSelfCardInfoView_jiangxi.lua @@ -36,6 +36,7 @@ function M.new(view, mainView) end function M:init() + print("lingmenginithand") MJPlayerSelfCardInfoView.init(self) local CardInfo = self._view:GetChild('Text_CardInfo') @@ -44,7 +45,7 @@ function M:init() self._view_handCardList = self._view:GetChild('List_HandCard') self._view_FZList = self._view:GetChild('List_FZ') self._view_outCardList = self._view:GetChild('List_OutCard') - self._viewBtn_getCard = self._view:GetChild('Btn_HandCard') + self._view_getCard = self._view:GetChild('Btn_HandCard') self._ctr_getCard = self._view:GetController('getCard') self._ctr_seletedGet = self._view:GetController('seletedGetCard') @@ -147,41 +148,60 @@ function M:UpdateHandCard(getcard, mp) -----------------------lingmeng--------------------------- + print("lingmenghand", getcard) getcard = getcard or false mp = mp or false local handCardName = self._viewText_cardInfo['Hand_Card'] -- if self._view_handCardList.numItems > #card_list - 1 then self._view_handCardList:RemoveChildren() + self._view_getCard:RemoveChildren() -- end + print("lingmenghand1", #card_list) + pt(card_list) for i = 0, (#card_list) - 1 do local tem_card = card_list[i + 1] local btn_card + print("lingmenghand2", i) if getcard and i == (#card_list) - 1 then - btn_card = self._viewBtn_getCard - btn_card.onClick:Set(function(context) + btn_card = self._view_getCard:AddItemFromPool() + print("lingmenghand2-1-1") + -- btn_card = self._view:GetChild('Btn_HandCard') + btn_card.onClick:Add(function(context) self:__OnClickGetCard(context) end) + print("lingmenghand2-1-2") + print("===================lingmengcuowulail==============") else + print("lingmenghand2-2-1") + -- if i >= self._view_handCardList.numItems then btn_card = self._view_handCardList:AddItemFromPool() -- else -- btn_card = self._view_handCardList:GetChildAt(i) -- end + print("lingmenghand2-2-2") end - self:fillCard2(btn_card, handCardName, tem_card) + print("lingmenghandbuchong", btn_card, handCardName, tem_card) + print("lingmenghandbuchong2", btn_card:GetChild("icon"), btn_card:GetChild("icon").url) + btn_card.icon = 'ui://Main_Majiang/' .. handCardName .. tem_card + -- self:fillCard2(btn_card, handCardName, tem_card) + print("lingmenghand2-3") local c_v = NewCardView(btn_card, tem_card) c_v.index = i c_v.old_postion = btn_card.xy _carViewList[#_carViewList + 1] = c_v btn_card.data = c_v + print("lingmenghand2-4") btn_card.onTouchBegin:Set(handler(self, self.onTouchBegin)) btn_card.onTouchMove:Set(handler(self, self.onTouchMove)) btn_card.onTouchEnd:Set(handler(self, self.__OnDragEnd)) -- btn_card.onClick:Set(handler(self, self.__OnClickHandCard)) + print("lingmenghand2-5") end + print("lingmenghand3", getcard, self._ctr_getCard) if getcard then self._ctr_getCard.selectedIndex = 1 @@ -191,7 +211,7 @@ function M:UpdateHandCard(getcard, mp) self._view_handCardList.onClickItem:Set(function(context) self:__OnClickHandCard(context) end) - + print("lingmenghand4") ---------------------------------------------------------- end @@ -281,7 +301,7 @@ end function M:__OnClickHandCard(context) print("=======================lingmengclickhand") - self._ctr_seletedGet.selectedIndex = 0 + self._ctr_seletedGet.selectedIndex = 1 local button = context.data -- local _carViewList = self._carViewList -- for i = 1, #_carViewList do @@ -403,10 +423,12 @@ function M:Clear(bskip) self._view_handCardList:RemoveChildren(0, -1, true) self._view_outCardList:RemoveChildren(0, -1, true) self._view_FZList:RemoveChildren(0, -1, true) + self._view_getCard:RemoveChildren(0, -1, true) self._view_handCardList.selectedIndex = -1 self._click_index = self._view_handCardList.selectedIndex self._ctr_seletedGet.selectedIndex = 0 + if bskip == nil or bskip == false then self._mask_liangpai:RemoveChildren(0, -1, true) end diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua index 6d1c28e9..0395b5ba 100644 --- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua @@ -131,7 +131,10 @@ function M:fillCard2(obj, pos_str, card) if DataManager.CurrenRoom.jing and card == DataManager.CurrenRoom.jing and obj:GetController('jing') then obj:GetController('jing').selectedIndex = 1 end + print("lingmenghandfill1") + obj:GetChild("icon").url = 'ui://Main_Majiang/' .. pos_str .. card + print("lingmenghandfill2") end function M:getBackCard(card) 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 c514a509c236283745063ddf19def9d173dfcf56..c6e53f365604efc74ff387f6009e77da82f1e80f 100644 GIT binary patch delta 418 zcmdnrEc~Hac!CpW6$1#c@US#`w|XjUv-pvY_>o&&_|x7YA63$RXqsK_WK%4x|m38+mQq!_550mxyvH2q*L zlkD{W&zZO-K;lpUk_G}G#lkXS@N?c74l`|OQgF|&MUYvQ~Jb^vDrP{~gqW<8JL zfSo|mT|j(x`|m(zAy%axPDTb121f>0hCqf$hIob&ptdru|Ns8~gSd)g{q&Qu%<9wk zdoc4(4`^a$QT+cOs00NdIg0ZN1LO3Il8nOB)w`Iaw@(gdj$vZFI(ebD$h2pS+}ru1 zn7tVpuT6iT$S5>-jbq+^ qHIAi9pUon^IHNFSduSiaC7$gDvssogaj=6#3=IvoU!BYHN*MskRcSu} delta 367 zcmey+EWE#2c!CqBCj$tua9?ipZuMqt^=8`Y&HSI+Xdg2tH(L_}%m06j3=Hghfl4j| zG3#OukZL6$)(7IvK#^V`?gQe5+iQ531z4v)KEWi!!!q&zKTb=QNkFaIlLedQC(pOx zp2Wf`!t?(h1cFQf+RDKG|KH>bta95Wg_!r*8y#n6`OenFc@b!B{-oSqxb%!k_zN5Yw7 zm>92ZSBzrLVr0BN{edE*%=8t}%)yK|rr%R!RGF?2!~B5p=5)qb<~YWy+Y@4$mohTm sY-fvS-p&@!Ql-yk9-o>~kh8t5kL3~%69fD9z}YNonYOdfV|l3z0N=fAW&i*H