From 98a12bdbbcec64fe8cdc5ead10cd4676c7d9c0bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com> Date: Thu, 15 May 2025 18:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=8B=E6=B3=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=88=86=E6=95=B0=E6=A2=AD=E5=93=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lichuan/EXPlayerInfoView_jiangxi.lua | 51 ------------------ .../extend/poker2/suoha/ExGameController.lua | 3 +- .../suoha/ExPlayerSelfPokerInfoView.lua | 24 ++++++--- .../suoha/ui/Extend_Poker_SuoHa_fui.bytes | Bin 28590 -> 28710 bytes 4 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 lua_probject/extend_project/extend/majiang/lichuan/EXPlayerInfoView_jiangxi.lua diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXPlayerInfoView_jiangxi.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXPlayerInfoView_jiangxi.lua deleted file mode 100644 index 89a128b5..00000000 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXPlayerInfoView_jiangxi.lua +++ /dev/null @@ -1,51 +0,0 @@ -local PlayerInfoView = require("Game.View.PlayerInfoView_copy") - -local M = {} - -function M.new(view, mainView) - setmetatable(M, { __index = PlayerInfoView }) - local self = setmetatable({}, { __index = M }) - self._view = view - self._main_view = mainView - self:init() - return self -end - -function M:init() - PlayerInfoView.init(self) -end - -function M:ShowInteraction(type, str) - if type == 3 then - Voice.DownLoad(str, function(clip) - if (clip) then - self:ShowMaskVoice(clip.length) - GameApplication.Instance:PlayVoice(clip) - end - end) - elseif type == 4 then - self:SetChat(str) - elseif type == 2 then - local chat_index = tonumber(str) - self._main_view:PlayChatSound(self._player.self_user.sex, chat_index) - local language, index = self._main_view:GetChatMsgLanguage(chat_index) - self:SetChat(self._main_view.Fix_Msg_Chat[index]) - elseif type == 1 then - self:SetBiaoqing("ui://Chat/" .. str) - end -end - -function M:UpdateRemainCard(card_num, hide) - if hide then - self._view:GetController("show_remain").selectedIndex = 0 - else - self._view:GetController("show_remain").selectedIndex = 1 - end - self._view:GetChild("com_remain"):GetChild("tex_remain").text = card_num -end - -function M:FillData(player) - PlayerInfoView.FillData(self, player) -end - -return M diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua b/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua index 9e12e508..5c873c68 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExGameController.lua @@ -85,8 +85,9 @@ function M:SendTipQi() _client:send(EXProtocol.GAME_EVT_FOLD, _data) end -function M:SendTipXia() +function M:SendTipXia(score) local _data = {} + _data["betScore"] = score local _client = ControllerManager.GameNetClinet _client:send(EXProtocol.GAME_EVT_BET, _data) end diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua index b1f8cb35..96d2bc6a 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua @@ -49,18 +49,27 @@ function M:ShowTips(type) self._view_tipsList:RemoveChildren() local obj = self._view_tipsList:AddItemFromPool() self.SetTipData(obj, TipType.qi) - local obj = self._view_tipsList:AddItemFromPool() - self.SetTipData(obj, TipType.xia) + obj = self._view_tipsList:AddItemFromPool() + obj.title = "1分" + self.SetTipData(obj, TipType.xia, 1) + obj = self._view_tipsList:AddItemFromPool() + obj.title = "2分" + self.SetTipData(obj, TipType.xia, 2) + obj = self._view_tipsList:AddItemFromPool() + obj.title = "5分" + self.SetTipData(obj, TipType.xia, 5) end end function M:OnClickTips(context) - local type = context.data.data.type + local button = context.data.data + local type = button.type if type == TipType.guo then elseif type == TipType.qi then self:ClickTipQi() elseif type == TipType.xia then - self:ClickTipXia() + local score = button.data + self:ClickTipXia(score) end end @@ -68,13 +77,14 @@ function M:ClickTipQi() self._gameCtr:SendTipQi() end -function M:ClickTipXia() - self._gameCtr:SendTipXia() +function M:ClickTipXia(score) + self._gameCtr:SendTipXia(score) end -function M.SetTipData(obj, type) +function M.SetTipData(obj, type, ...) obj.data = {} obj.data.type = type + obj.data.data = ... obj:GetController('type').selectedIndex = type end diff --git a/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes b/wb_unity_pro/Assets/ART/extend/poker2/suoha/ui/Extend_Poker_SuoHa_fui.bytes index ab692c52b5a089133567bc84afb21ff472bb0925..9ecd8bf39633d9bc704383ee3eb7d86f87ac8fb3 100644 GIT binary patch delta 4704 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 QwyqqLVA{HC+~s!v0TomqHUIzs delta 4096 zcmcgvd0dp`7CvXb`S>7IKwt($7zYtlkWFy`2V_%3&>000aEZz?Zz`l_O0t-yVrp_) zw4D}P%!ROW&5NdHX=c}Z%Qi7nvrX;ZY*p^_eFH?l-@X4f{LajI&-0w~o_9Sj8(VnG zX?`Hbt1lU!k`EeP^SuWrE0jZ{scY+X-8xB^E<~!$Q*VYt;vls|=4%jeR6mHn{O)}V z-_TUnrP3@Pm;%K&%-?grLbGT#&5@OUMOr!HRZxXo@Vi;Pljg!Yu6vO-ug$u-d#O5~ z?t-s0R!g(BR9Qo7#TMk`2jqmwBKHLaE9e1rZ*s4<4aBL=Q`5@Ia48 zC~{+pr?@ghO|;&iBb;WcQD_4_DsKi)Q69tmhV^jrN#wu@v&ArMudY)9MkzNH59rlO+6t#)A(`%yGN|o2?4JosgDLZI8 zel7BeEtz+=56p``RcIIOhJQ-03U!ase`Bxd%3gX?g6-A3Pd3QS5dU2Gjp{-89FpAL+1g=fZ)0*E?wzR}f&LD?D=ocq_^9-Yn6DnA_vpAh z8y;u6+*sX*wyj zk)yO0GSeCQLXJm{^EnIOFXO>2Q0$)wb~Q85BDwFkp)Z=kRFU0L^gS!?`eiHqh!g#bY?z-PJO<4({xFmOiA{+}L*USj5TRjEwCZFR zkCzjJ@_J7|K_nk8AU`g27Y&{WKMGQqJjt6Z*zqHhf_+g_6$<5Ia7(}~mD`izc`~k^ zAX%T}CkK*(m8m>UPA9qeMoAc4<5PyXGx#Qie~!qrLe7k|%7=sNv`CzYoB0-*F(g-8 z1${c-Dm#bdYiZDL;~CO*=mh0PM#}0lIQX~S(Dsbn@=Xbixw0m*(m+~^%Gu)xw2i9_4QSWf- zg_P@fl@vLqXd9s4&#Ps(BVT(F`WjvjpR_G7#I+>H2ZE)&YWOr)5)(HE9{E+yh z6)F$&BXV1sOIwfhH}IpfFYRtE2l!*Ci>V_Dv?pMH5=C*thzy@5*q_GA5}n7)E|6ok zFxfXkm9FVwN&_loZ2DB?S(M1N>65CTCm-_Vjru+0{?pg?ud`JDm7V>MzECAFdigpd zQh9-26#vZ0{F0Ps257r5hcELcS(RC;yuzF1VrIU!1#`TWw}~Ump#=bM~An^9t}uiZoA#^-O0OTbGF-eH}4@b?T7De z?Ht2*FTV-DZy>L>+YR4+cr2_L>CT~<_sgk~Im!WkOCm;1@;QbpqnHok)z^x{DdL+m zKz588t-;QR_^^29R2ll)d_-2~ROx(vhu=kx&FJT_!5=kxv|&HW$J{3s7ndIA=xBGG z_xQN<%yq|kpHE0bt~<^L{13#qgns=Ee(4xD|0MrYHjP=L{EI)7_&g_nB(-_Dd`gbu z`(v@@7bu_br!qT#GJhuT=I45UPO(H@xc~VHDKqzw_;9nNjt%G2QZ{x0x5%lnx!z|8 zwM$7ve-Ry=ym3j&7kpNhjw|9XrP<=|%h4F#ImVGN>-D%Ns5S|6TD>puSFokS)=RGR zwM&^ZfiFs^Gf4Rwub3^)lAhmEg>lU|P`^>+V{JliDiujT=X8Frnm+F04 zC#Z)&3hKyZuPdCdNQ*0re~|ab&yxD_4v82)TO1P{avbdo6SCEn{3D8BLO~v1)$dFb z|0L@RBD6T<{4@U|2MRK@MCiZb71X6LLz@NtcfKZtg%0gbEOP~4mkov4zVo3kWGuI- z5-E6*Je}T4x=oDIDgmUKNQO@w=erF0G!tV^Pl2TBq#!vM*Ilkg2Dx2#6$>46h#)Yn>1)`AD#iF3Syy1lO|V+tikPQ z4La{YITNUTl7X5|f}aL)KO%JBBS2k~0z;zPV z?jHlZu`Rle)IjvCjLbL==$SuIBle;W)ElT@v5^^Lhwx+|?x&9)`7qG*;=qt{qvsmn z4Zw9y7Q{jafmZbz3