From 9f6a0d439a735e7e246c25afa427d8f14125ee73 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, 16 May 2025 11:13:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A2=AD=E5=93=88=E6=96=B0?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE2099?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/poker2/suoha/ExMainView.lua | 7 ++- .../suoha/ExPlayerSelfPokerInfoView.lua | 58 +++++++++--------- .../suoha/ui/Extend_Poker_SuoHa_fui.bytes | Bin 29771 -> 29402 bytes 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua b/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua index 8431f0c3..fea9aa16 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExMainView.lua @@ -317,9 +317,6 @@ function M:EventInit() local cardInfo = _player_card_info[self:GetPos(i)] if cardList then cardInfo:UpdateHandPoker(cardList) - if self:GetPos(bank_seat) == 1 and bank_seat == i then - cardInfo:ShowTips(1) - end end end end) @@ -338,6 +335,10 @@ function M:EventInit() _gamectr:AddEventListener(EXGameEvent.OnTurnAction, function(...) local arg = { ... } + local data = arg[1] + local seat = data.seat + local cardInfo = _player_card_info[self:GetPos(seat)] + cardInfo:ShowTips(data.actions) end) end diff --git a/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua index b8c984a8..6b67d5b9 100644 --- a/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker2/suoha/ExPlayerSelfPokerInfoView.lua @@ -3,10 +3,13 @@ --- DateTime: 2017/12/13 17:04 --- -local TipType = { - guo = 0, - qi = 1, - xia = 4 +local TipID = { + xia = 1012, + gen = 1013, + jia = 1014, + suo = 1015, + qi = 1016, + guo = 1017 } local EXPlayerPokerInfoView = import('.EXPlayerPokerInfoView') @@ -43,37 +46,36 @@ function M:init() self._ctr_out = view:GetController('out') end -function M:ShowTips(type) +function M:ShowTips(tipsList) self._ctr_out.selectedIndex = 1 - if type == 1 then - self._view_tipsList:RemoveChildren() - local obj = self._view_tipsList:AddItemFromPool() - self.SetTipData(obj, TipType.qi) - 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) + self._view_tipsList:RemoveChildren() + for i = 1, #tipsList do + if tipsList[i] == 1012 then + local xiaScore = { 1, 2, 5 } + for j = 1, 3 do + local obj = self._view_tipsList:AddItemFromPool() + self.SetTipData(obj, tipsList[j], xiaScore[j]) + obj.title = string.format("%d分", xiaScore[j]) + end + else + local obj = self._view_tipsList:AddItemFromPool() + self.SetTipData(obj, tipsList[i]) + end end end function M:OnClickTips(context) local button = context.data.data - local type = button.type + local id = button.id local _data = {} - if type == TipType.guo then - elseif type == TipType.qi then - _data["id"] = 1016 - self:ClickTip(_data) - elseif type == TipType.xia then + if id == TipID.xia then local score = button.data - _data["id"] = 1012 + _data["id"] = id _data["betScore"] = tonumber(score) self:ClickTip(_data) + else + _data["id"] = id + self:ClickTip(_data) end end @@ -81,11 +83,11 @@ function M:ClickTip(_data) self._gameCtr:SendTip(_data) end -function M.SetTipData(obj, type, ...) +function M.SetTipData(obj, id, ...) obj.data = {} - obj.data.type = type + obj.data.id = id obj.data.data = ... - obj:GetController('type').selectedIndex = type + obj:GetController('type').selectedIndex = id - 1012 end function M:Clear() 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 0d3f9b1bc77fd2d467f25209db5225f4999da5d5..899e1277dc951dfe59e8920a8fcd5ea7eecab6bc 100644 GIT binary patch delta 4810 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