diff --git a/lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua b/lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua index 95953174..e9262df4 100644 --- a/lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua +++ b/lua_probject/extend_project/extend/zipai/hechi/EXPlayBackView.lua @@ -146,7 +146,7 @@ function M:BtnsSafe() end local text_playName = self._view:GetChild('text_playName') if text_playName then - text_playName.text = "放炮罚" + text_playName.text = "河池字牌" end end diff --git a/lua_probject/extend_project/extend/zipai/hechi/PlayerCardInfoView.lua b/lua_probject/extend_project/extend/zipai/hechi/PlayerCardInfoView.lua index a32c8ba8..ec1f1bf2 100644 --- a/lua_probject/extend_project/extend/zipai/hechi/PlayerCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/hechi/PlayerCardInfoView.lua @@ -22,7 +22,7 @@ function M:GetHandCardPos(cards_view, cards) y = 0 - (75 * cards_view.index_Y) return Vector2.New(x, y) end - +--对方 function M:UpdateFzList( fz_list ,ispaly,seat) self._area_fz_list:RemoveChildren(0,-1,true) for i = 1,#fz_list do @@ -89,7 +89,7 @@ function M:UpdateFzList( fz_list ,ispaly,seat) else for j=1,4 do if j==4 then - fzcards:GetChild("card_"..j).icon =self:getCardItem("ui://Main_RunBeard/202_",fz_list[i].card) + fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300" else fzcards:GetChild("card_"..j).icon ="ui://Main_RunBeard/202_1_300" end diff --git a/lua_probject/extend_project/extend/zipai/hechi/PlayerSelfCardInfoView.lua b/lua_probject/extend_project/extend/zipai/hechi/PlayerSelfCardInfoView.lua index 0d2e1884..b51c9f7b 100644 --- a/lua_probject/extend_project/extend/zipai/hechi/PlayerSelfCardInfoView.lua +++ b/lua_probject/extend_project/extend/zipai/hechi/PlayerSelfCardInfoView.lua @@ -22,7 +22,8 @@ function M:onTouchBegin(context) if DataManager.CurrenRoom.curren_outcard_seat == DataManager.CurrenRoom.self_player.seat then self:ShowHuTip(card.card_item) end - card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_", card.card_item) + card.btn_card:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/203_",card.card_item) + card.btn_card.height = card.btn_card.width/97*287 card.btn_card.sortingOrder = 100 local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y)) card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50) @@ -317,7 +318,7 @@ function M:PlayingOutCardAnima(card) self:ClearOutCard() end) end - +--自己 function M:UpdateFzList(fz_list, ispaly) self._area_fz_list:RemoveChildren(0, -1, true) for i = 1, #fz_list do @@ -332,6 +333,7 @@ function M:UpdateFzList(fz_list, ispaly) local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") fzcards:GetChild("card_" .. 1).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].active_card) fzcards:GetController("c2").selectedIndex = 1 + fzcards:GetController("c3").selectedIndex = 1 fzcards:GetChild("card_" .. 2).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].opcard[1]) fzcards:GetChild("card_" .. 3).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].opcard[2]) fzcards.x, fzcards.y = 0, 0 @@ -345,9 +347,14 @@ function M:UpdateFzList(fz_list, ispaly) self:playAnim(fzitem, fzcards, #fz_list, i, ispaly) elseif fz_list[i].type == RB_FZType.Wei then local fzcards = UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Fz_0_3") - fzcards:GetController("c1").selectedIndex = 1 + --fzcards:GetController("c1").selectedIndex = 1 for j = 1, 3 do - fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card) + if j == 3 then + fzcards:GetChild("card_" .. j).icon = self:getCardItem("ui://Main_RunBeard/202_", fz_list[i].card) + else + fzcards:GetChild("card_" .. j).icon = "ui://Main_RunBeard/202_1_300" + end + end fzcards.x, fzcards.y = 0, 0 self:playAnim(fzitem, fzcards, #fz_list, i, ispaly) diff --git a/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua b/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua index ebeebaff..decee647 100644 --- a/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua +++ b/lua_probject/extend_project/extend/zipai/hechi/RunBeard_ResultView.lua @@ -276,7 +276,16 @@ function M:FillItemData(room, data, item) win_data = info_list[i] end end - + local terminationCtr = self._view:GetController('isNormalTerminationM') + if terminationCtr then + if Yes_win then + -- 如果有赢家 (is_win == true)，设置为 0 (正常结束/有胡牌) + terminationCtr.selectedIndex = 0 + else + -- 如果没有赢家 (is_win == false，如流局或解散无胡牌)，设置为 1 + terminationCtr.selectedIndex = 1 + end + end if win_data.seat == room.self_player.seat then self._view:GetChild('show_win').visible = true self._view:GetChild('show_low').visible = false @@ -346,11 +355,23 @@ function M:FillItemData(room, data, item) local dipais = UIPackage.CreateObjectFromURL('ui://Extend_Poker_HeChi/FullName') dipais:GetChild('n0').icon = 'ui://Extend_Poker_HeChi/hu_' .. win_data.mingtang[i].mingtang if win_data.mingtang[i].type == 1 and win_data.mingtang[i].score ~= 0 then - dipais:GetChild('n2').text = ' x2' + if win_data.mingtang[i].mingtang == 21 then + dipais:GetChild('n2').text = ' +1' + else + dipais:GetChild('n2').text = ' x2' + end elseif win_data.mingtang[i].type == 2 and win_data.mingtang[i].score ~= 0 then - dipais:GetChild('n2').text = ' x2' + if win_data.mingtang[i].mingtang == 21 then + dipais:GetChild('n2').text = ' +1' + else + dipais:GetChild('n2').text = ' x2' + end elseif win_data.mingtang[i].type == 3 and win_data.mingtang[i].score ~= 0 then - dipais:GetChild('n2').text = ' x2' + if win_data.mingtang[i].mingtang == 21 then + dipais:GetChild('n2').text = ' +1' + else + dipais:GetChild('n2').text = ' x2' + end end fullname_list:AddChild(dipais) end diff --git a/lua_probject/extend_project/extend/zipai/hechi/main/HuTipView.lua b/lua_probject/extend_project/extend/zipai/hechi/main/HuTipView.lua index d6e6e97b..c0251faf 100644 --- a/lua_probject/extend_project/extend/zipai/hechi/main/HuTipView.lua +++ b/lua_probject/extend_project/extend/zipai/hechi/main/HuTipView.lua @@ -58,12 +58,14 @@ function M:FillData(cards) end for i = 1, num do local item = lst_card:AddItemFromPool() + printlog("tingpaishliang",cards[i]) item:GetChild("icon").icon = "ui://Main_RunBeard/202_1_" .. cards[i] end SetObjEnabled(self._view, true) else SetObjEnabled(self._view, false) end + end return M \ No newline at end of file diff --git a/lua_probject/extend_project/extend/zipai/hechi/main/ZPMainView.lua b/lua_probject/extend_project/extend/zipai/hechi/main/ZPMainView.lua index 5e0a452a..199019f0 100644 --- a/lua_probject/extend_project/extend/zipai/hechi/main/ZPMainView.lua +++ b/lua_probject/extend_project/extend/zipai/hechi/main/ZPMainView.lua @@ -226,7 +226,7 @@ function M:BtnsSafe() end local text_playName = self._view:GetChild('text_playName') if text_playName then - text_playName.text = "放炮罚" + text_playName.text = "河池字牌" end end diff --git a/lua_probject/main_project/main/zipai/CardCheck.lua b/lua_probject/main_project/main/zipai/CardCheck.lua index d262d828..346155c3 100644 --- a/lua_probject/main_project/main/zipai/CardCheck.lua +++ b/lua_probject/main_project/main/zipai/CardCheck.lua @@ -192,12 +192,10 @@ function M:tryWin(player) return true end return false - else - if (self.pair_count > 0) then - return false - end - return true - end + else + if (self.pair_count > 0) then return false end + return true -- 【这里允许了无将胡牌！】 + end end local activeCard = 0 for i = 1, #self.cardList do @@ -332,12 +330,15 @@ end function M.tingPai(player, room) local self = setmetatable({}, {__index = M}) local tingList = {} - local cardInhand = player.handcard_list + -- 克隆手牌，保护原始数据 + local cardInhand = membe_clone(player.handcard_list) if not cardInhand or #cardInhand == 0 then return tingList end + local kan_huxi = 0 local kan_cards = {} + -- 计算坎牌胡息并移除 for j = 1, #player.fz_list do for i = 1, #cardInhand do if cardInhand[i] == player.fz_list[j].active_card and player.fz_list[j].type == 3 then @@ -356,41 +357,64 @@ function M.tingPai(player, room) removeCard(cardInhand, kan_cards[i], 3) end end - player.tiCount = 0 - player.paoCount = 0 + + -- 【重要】不要修改原始 player 对象，创建一个临时表用于 init 调用 + local tempPlayer = { + tiCount = 0, + paoCount = 0, + hu_xi = player.hu_xi, -- 确保 hu_xi 被正确引用 + fz_list = player.fz_list + } + if #player.fz_list > 0 then for i = 1, #player.fz_list do if player.fz_list[i].type == 6 then - player.paoCount = player.paoCount + 1 + tempPlayer.paoCount = tempPlayer.paoCount + 1 elseif player.fz_list[i].type == 7 then - player.tiCount = player.tiCount + 1 + tempPlayer.tiCount = tempPlayer.tiCount + 1 end end end + + local minHuXi = self:getHuxi(room) + for k = 100, 200, 100 do for i = 1, 10 do local tem = k + i - local result = init(self, player, cardInhand, tem) + -- 使用 tempPlayer 进行判断，避免污染全局 player + local result = init(self, tempPlayer, cardInhand, tem) + local num = 0 for k = 1, #self.stackHuxi do num = num + self.stackHuxi[k] end - if result == false or (player.hu_xi + num + kan_huxi) < (self:getHuxi(room)) then + + local totalHuXi = (tempPlayer.hu_xi + num + kan_huxi) + local isZeroHuXiSpecial = (totalHuXi == 0) + + -- 【核心修复】：必须首先保证牌型结构正确 (result == true) + if result then + -- 牌型正确的前提下，检查胡息 + if (totalHuXi >= minHuXi) or isZeroHuXiSpecial then + tingList[#tingList + 1] = tem + end + else + -- 牌型结构不正确，尝试跑胡/补救逻辑 if #player.fz_list > 0 then for k = 1, #player.fz_list do if tem == player.fz_list[k].active_card then local ctype = player.fz_list[k].type if ctype == 2 or ctype == 3 or ctype == 4 or ctype == 5 then - local paohu = init(self, player, cardInhand) + -- 跑胡检测：不带 tem，看剩余牌是否能胡（靠张） + local paohu = init(self, tempPlayer, cardInhand) if paohu then local num2 = 0 for j = 1, #self.stackHuxi do num2 = num2 + self.stackHuxi[j] end - if - (num2 + player.hu_xi + kan_huxi + self:GetFzData(tem, ctype)) >= - (self:getHuxi(room)) - then + -- 跑胡胡息计算 + local runHuTotal = num2 + tempPlayer.hu_xi + kan_huxi + self:GetFzData(tem, ctype) + if runHuTotal >= minHuXi then tingList[#tingList + 1] = tem end end @@ -398,20 +422,11 @@ function M.tingPai(player, room) end end end - else - local num1 = 0 - for k = 1, #self.stackHuxi do - num1 = num1 + self.stackHuxi[k] - end - if (player.hu_xi + num1 + kan_huxi) >= (self:getHuxi(room)) then - tingList[#tingList + 1] = tem - end end end end return tingList end - function M:getHuxi(room) if room.game_id == 301 then return 8 @@ -419,6 +434,9 @@ function M:getHuxi(room) if room.game_id == 15 then return 15 end + if room.game_id == 16 then + return 10 + end if room.game_id == 17 then return 15 end diff --git a/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua b/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua index f83ff601..834e58f5 100644 --- a/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua +++ b/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua @@ -54,8 +54,8 @@ function M:init() self._isDrg = false self.card_list = {} -- 牌的btn code type pos 等等 self.cards_count = 0 -- 牌的总列数 - self.card_width = 87 - self.card_hight = 110 + self.card_width = 198 + self.card_hight = 250 self.outcard_button = nil self._room = DataManager.CurrenRoom self._area_handcard_list = view:GetChild('area_handcard_list') @@ -197,9 +197,9 @@ function M:InitHandCard(isPlayAni, index) btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code) btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) - self.card_width = 87 * self:getCardSize() - self.card_hight = 110 * self:getCardSize() - local x, y = 500, (j * 75) - 500 + self.card_width = btn_card.width * self:getCardSize() + self.card_hight = btn_card.height * self:getCardSize() + local x, y = 500, (j * 85) - 500 btn_card:SetXY(x, y) self._area_handcard_list:AddChild(btn_card) self._area_handcard_list:SetChildIndex(btn_card, 5 - j) @@ -245,8 +245,8 @@ function M:InitHandCard(isPlayAni, index) btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code) btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) - self.card_width = 87 * self:getCardSize() - self.card_hight = 110 * self:getCardSize() + self.card_width = btn_card.width * self:getCardSize() + self.card_hight = btn_card.height * self:getCardSize() self._area_handcard_list:AddChild(btn_card) self._area_handcard_list:SetChildIndex(btn_card, 5 - j) local card_view = NewCardView(btn_card, card_code, i, j) @@ -284,8 +284,6 @@ function M:UpdateHandCards(list) self.outcard_button = nil local CountCards = {} - -- print("lingmengUpdateHandCards") - -- pt(list) for i = 1, #list do CountCards[list[i].index_X] = CountCards[list[i].index_X] == nil and 1 or CountCards[list[i].index_X] + 1 end @@ -295,8 +293,8 @@ function M:UpdateHandCards(list) btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_code) btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) - self.card_width = 87 * self:getCardSize() - self.card_hight = 110 * self:getCardSize() + self.card_width = btn_card.width * self:getCardSize() + self.card_hight = btn_card.height * self:getCardSize() local card_view = NewCardView(btn_card, card_code, list[i].index_X, list[i].index_Y) --存牌堆 self.card_list[#self.card_list + 1] = card_view @@ -440,9 +438,13 @@ function M:UpdateCardDisplay() local card_view = self.card_list[i] card_view.btn_card:RemoveFromParent() card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item) + self.card_width = card_view.btn_card.width * self:getCardSize() + self.card_hight = card_view.btn_card.height * self:getCardSize() self._area_handcard_list:AddChild(card_view.btn_card) card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3) end + self:UpdateOutLine() + self:UpdateHandCardsPos() end --更新手牌大小 @@ -458,11 +460,22 @@ function M:UpdateCardSize() card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item) card_view.btn_card:GetChild('icon'):SetScale(self:getCardSize(), self:getCardSize()) card_view.btn_card:GetChild('n6'):SetScale(self:getCardSize(), self:getCardSize()) - self.card_width = 87 * self:getCardSize() - self.card_hight = 110 * self:getCardSize() + self.card_width = card_view.btn_card.width * self:getCardSize() + self.card_hight = card_view.btn_card.height * self:getCardSize() self._area_handcard_list:AddChild(card_view.btn_card) card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3) end + self:UpdateOutLine() + self:UpdateHandCardsPos() +end + +function M:UpdateOutLine() + if self:getCardSize() == 1.03 then + self._data_outLinePos = 90 - (125 * 3) + elseif self:getCardSize() == 1 then + self._data_outLinePos = 147 - (197 * 3) + end + self._view_outLine.y = self._data_outLinePos - 80 end function M:UpdateIsOnClick(isOut) @@ -722,17 +735,42 @@ end --计算手牌位置 function M:GetHandCardPos(cards_view, cards) local x, y = 0, 0 - local card_width = self.card_width -- 牌的宽度 + local card_width = self.card_width - (self._room.change_card_display == "1_" and 8 or 1) -- 牌的宽度 + local card_clounm = self._room.change_card_display == "1_" and 0 or 30 local middle_x = self._area_handcard_list.width / 2 local start_x = middle_x - (cards / 2 * (card_width)) x = start_x + (card_width) * (cards_view.index_X - 1) - if self:getCardSize() == 1 then - y = 90 - (85 * cards_view.index_Y) - elseif self:getCardSize() == 1.2 then - y = 70 - (100 * cards_view.index_Y) - elseif self:getCardSize() == 0.8 then - y = 100 - (65 * cards_view.index_Y) + -- local card_height = self.card_hight + -- y = 90 - card_height * 0.66 * cards_view.index_Y + if self:getCardSize() == 1.2 then + local icon = cards_view.btn_card:GetChild('icon') + local n7 = cards_view.btn_card:GetChild('n7') + local scaleX = icon.scaleX + local scaleY = icon.scaleY + -- 设置缩放 + n7:SetScale(scaleX, scaleY) + local iconRight = icon.x + icon.width * scaleX -- 缩放后的右边缘 + local iconTop = icon.y -- 缩放不影响 y 起始点，但影响高度显示 + -- 计算 n7 缩放后的尺寸 + local n7Width = n7.width * scaleX + n7:SetXY(iconRight - n7Width, iconTop) + + y = 147 - ((203-card_clounm) * cards_view.index_Y) + elseif self:getCardSize() == 1 then + local icon = cards_view.btn_card:GetChild('icon') + local n7 = cards_view.btn_card:GetChild('n7') + local scaleX = icon.scaleX + local scaleY = icon.scaleY + -- 设置缩放 + n7:SetScale(scaleX, scaleY) + local iconRight = icon.x + icon.width * scaleX -- 缩放后的右边缘 + local iconTop = icon.y -- 缩放不影响 y 起始点，但影响高度显示 + -- 计算 n7 缩放后的尺寸 + local n7Width = n7.width * scaleX + n7:SetXY(iconRight - n7Width, iconTop) + + y = 147 - ((197-card_clounm) * cards_view.index_Y) end return Vector2.New(x, y) end @@ -860,6 +898,9 @@ end --得到设置的牌大小 function M:getCardSize() if self._room.change_card_size ~= nil then + if self._room.change_card_size ~= 1.2 and self._room.change_card_size ~= 1 then + self._room.change_card_size = 1 + end return self._room.change_card_size else return 1 diff --git a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info index e631122c..f5c302b9 100644 --- a/wb_new_ui/.objs/metas/h30s8vme/la4eb.info +++ b/wb_new_ui/.objs/metas/h30s8vme/la4eb.info @@ -17,9 +17,6 @@ }, "n121_xevg": { "hidden": true - }, - "n116_xevg": { - "collapsed": true } } } \ No newline at end of file diff --git a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info index 0c21f596..18b7337b 100644 --- a/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info +++ b/wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info @@ -16,6 +16,10 @@ "n154_r1mo": { "collapsed": true }, + "n206_ib2w": { + "locked": true, + "hidden": true + }, "n179_kxwj": { "hidden": true }, @@ -25,6 +29,9 @@ "n170_o49p": { "hidden": true }, + "n183_yfzf": { + "locked": true + }, "n35_k3io": { "hidden": true } diff --git a/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info index aeee2ee7..10a7c119 100644 --- a/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info +++ b/wb_new_ui/.objs/metas/mzvoz9ud/m1i335.info @@ -3,18 +3,6 @@ "n16_pt1r": { "hidden": true }, - "n33_n1ry": { - "hidden": true - }, - "n19_pt1r": { - "collapsed": true - }, - "n48_j5c2": { - "hidden": true - }, - "n35_n1ry": { - "hidden": true - }, "n40_n1ry": { "hidden": true }, @@ -36,20 +24,23 @@ "n17_pt1r": { "hidden": true }, - "n77_p9qe": { + "n48_j5c2": { "hidden": true }, "n15_pt1r": { "hidden": true }, + "n58_fnpw": { + "collapsed": true + }, + "n44_n1ry": { + "collapsed": true + }, "n32_n1ry": { "hidden": true }, - "n31_n1ry": { - "hidden": true - }, - "n43_n1ry": { - "hidden": true + "n19_pt1r": { + "collapsed": true }, "n68_w06x": { "hidden": true diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 4a4dfa9a..5f707803 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -4,8 +4,30 @@ "doc.openedDocs": [ "ui://v0j9abjygq7mgo", "ui://hrxsdiixla4e2c", + "ui://s63l0suw6cpqv", + "ui://fnuxqeflnrnod", + "ui://egnzysm7ffp36a", "ui://8wph7p8nyffnhr", "ui://mzvoz9udm1i335", + "ui://lkq9ne9speuqc", + "ui://m7iejg46l679hws", + "ui://m7iejg46kwi0hmc", + "ui://m7iejg46kwi0hme", + "ui://mzvoz9udm1i382", + "ui://mzvoz9udm1i32b", + "ui://mzvoz9udm1i33m", + "ui://m7iejg4610snh5j", + "ui://m7iejg46h46p7ish", + "ui://mzvoz9udm1i32i", + "ui://h30s8vmela4eb", + "ui://mzvoz9udm1i34z", + "ui://mzvoz9udm1i35m", + "ui://mzvoz9udm1i35j", + "ui://mzvoz9udm1i358", + "ui://mzvoz9udm1i35f", + "ui://mzvoz9udm1i35b", + "ui://mtk9dj10m1i32v", + "ui://z3z0ysurygxgd", "ui://8wph7p8nyffnmy", "ui://8wph7p8nyffn8s", "ui://v0j9abjygq7med", @@ -14,14 +36,26 @@ "ui://lkq9ne9ssyh3rk", "ui://mzvoz9udm1i33c", "ui://1utjt0r2ufu92i", + "ui://ppu1wv76j4mf9j", + "ui://ypulwxjhl9mn14", "ui://1utjt0r2ufu92t", "ui://mzvoz9udm1i32j", "ui://442j0uepygxga", "ui://4skil1l6piv91ny", + "ui://niy3ldiwl9mn14", + "ui://9n9stu2eprgzee", "ui://v0j9abjygq7mgp", "ui://lkq9ne9speuqc6", "ui://lkq9ne9speuq8b", "ui://lkq9ne9speuq5a", + "ui://lkq9ne9speuq6e", + "ui://hrxsdiixla4e69", + "ui://lkq9ne9speuq2q", + "ui://lkq9ne9speuq3", + "ui://lkq9ne9speuq2", + "ui://v6yvqp7wcyprwq", + "ui://v0j9abjygq7mej", + "ui://lkq9ne9speuq9d", "ui://lkq9ne9speuq6p", "ui://lkq9ne9speuq8r", "ui://lkq9ne9speuq8w", @@ -42,12 +76,16 @@ "test.device": "1080p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://mzvoz9udm1i335", + "doc.activeDoc": "ui://lkq9ne9speuq3", "libview.twoColumn": false, "libview.expandedNodes": [ "27vd145b", "/", "27vd145b", + "/font/", + "27vd145b", + "/font/font_gameTableName/", + "27vd145b", "/images/", "egnzysm7", "/", @@ -81,6 +119,12 @@ "/", "8wph7p8n", "/image/", + "2d9xdj6z", + "/", + "2d9xdj6z", + "/images/", + "2d9xdj6z", + "/images/LobbyMui/", "lkq9ne9s", "/", "lkq9ne9s", @@ -88,17 +132,21 @@ "lkq9ne9s", "/component/", "lkq9ne9s", + "/component/HuTip/", + "lkq9ne9s", "/component/Main/", "lkq9ne9s", + "/component/Main/component/", + "lkq9ne9s", "/component/cards/", "lkq9ne9s", + "/component/chi_peng_effect/", + "lkq9ne9s", "/image/", "lkq9ne9s", - "/image/MRBMui/", - "lkq9ne9s", - "/image/main_2/", - "lkq9ne9s", - "/images/" + "/images/", + "m7iejg46", + "/" ], "auxline1": true, "snapToGrid": true, diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/0 - 0.png b/wb_new_ui/assets/Common/font/font_gameTableName/0 - 0.png index 48a94642..951b2ff8 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/0 - 0.png and b/wb_new_ui/assets/Common/font/font_gameTableName/0 - 0.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/1 - 1.png b/wb_new_ui/assets/Common/font/font_gameTableName/1 - 1.png index 6ecc86e1..481ce548 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/1 - 1.png and b/wb_new_ui/assets/Common/font/font_gameTableName/1 - 1.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/10 - 红.png b/wb_new_ui/assets/Common/font/font_gameTableName/10 - 红.png index faf11584..fee8831d 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/10 - 红.png and b/wb_new_ui/assets/Common/font/font_gameTableName/10 - 红.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/11 - 中.png b/wb_new_ui/assets/Common/font/font_gameTableName/11 - 中.png index 740a449f..05378d07 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/11 - 中.png and b/wb_new_ui/assets/Common/font/font_gameTableName/11 - 中.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/12 - 麻.png b/wb_new_ui/assets/Common/font/font_gameTableName/12 - 麻.png index bc63f7a7..9ad4934c 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/12 - 麻.png and b/wb_new_ui/assets/Common/font/font_gameTableName/12 - 麻.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/13 - 将.png b/wb_new_ui/assets/Common/font/font_gameTableName/13 - 将.png index 67a3b11e..c49b1482 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/13 - 将.png and b/wb_new_ui/assets/Common/font/font_gameTableName/13 - 将.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/14 - 转.png b/wb_new_ui/assets/Common/font/font_gameTableName/14 - 转.png index 916d8440..0cdf3619 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/14 - 转.png and b/wb_new_ui/assets/Common/font/font_gameTableName/14 - 转.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/15 - 跑.png b/wb_new_ui/assets/Common/font/font_gameTableName/15 - 跑.png index 47242904..2cd920a0 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/15 - 跑.png and b/wb_new_ui/assets/Common/font/font_gameTableName/15 - 跑.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/16 - 得.png b/wb_new_ui/assets/Common/font/font_gameTableName/16 - 得.png index dae419e8..432158c2 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/16 - 得.png and b/wb_new_ui/assets/Common/font/font_gameTableName/16 - 得.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/17 - 快.png b/wb_new_ui/assets/Common/font/font_gameTableName/17 - 快.png index 0090586a..72d3b461 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/17 - 快.png and b/wb_new_ui/assets/Common/font/font_gameTableName/17 - 快.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/18 - 放.png b/wb_new_ui/assets/Common/font/font_gameTableName/18 - 放.png index aad4a335..21889485 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/18 - 放.png and b/wb_new_ui/assets/Common/font/font_gameTableName/18 - 放.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/19 - 炮.png b/wb_new_ui/assets/Common/font/font_gameTableName/19 - 炮.png index 5eab7ef3..2e6f3599 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/19 - 炮.png and b/wb_new_ui/assets/Common/font/font_gameTableName/19 - 炮.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/2 - 2.png b/wb_new_ui/assets/Common/font/font_gameTableName/2 - 2.png index f67e2fe4..6c9627ef 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/2 - 2.png and b/wb_new_ui/assets/Common/font/font_gameTableName/2 - 2.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/20 - 罚.png b/wb_new_ui/assets/Common/font/font_gameTableName/20 - 罚.png index a285c8a3..a3fb5454 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/20 - 罚.png and b/wb_new_ui/assets/Common/font/font_gameTableName/20 - 罚.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/21 - 把.png b/wb_new_ui/assets/Common/font/font_gameTableName/21 - 把.png index a7fc3f2f..b862329e 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/21 - 把.png and b/wb_new_ui/assets/Common/font/font_gameTableName/21 - 把.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/22 - 结.png b/wb_new_ui/assets/Common/font/font_gameTableName/22 - 结.png index 233cc071..02ba18c0 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/22 - 结.png and b/wb_new_ui/assets/Common/font/font_gameTableName/22 - 结.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/23 - ..png b/wb_new_ui/assets/Common/font/font_gameTableName/23 - ..png index a99b948e..18ee1b44 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/23 - ..png and b/wb_new_ui/assets/Common/font/font_gameTableName/23 - ..png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/24 - 河.png b/wb_new_ui/assets/Common/font/font_gameTableName/24 - 河.png new file mode 100644 index 00000000..ec61e15e Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/24 - 河.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/24 -.png b/wb_new_ui/assets/Common/font/font_gameTableName/24 -.png deleted file mode 100644 index 3330eb31..00000000 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/24 -.png and /dev/null differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/25 - 池.png b/wb_new_ui/assets/Common/font/font_gameTableName/25 - 池.png new file mode 100644 index 00000000..dda1671f Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/25 - 池.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/26 - 胡.png b/wb_new_ui/assets/Common/font/font_gameTableName/26 - 胡.png new file mode 100644 index 00000000..df11d83b Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/26 - 胡.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/27 - 子.png b/wb_new_ui/assets/Common/font/font_gameTableName/27 - 子.png new file mode 100644 index 00000000..95c9f828 Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/27 - 子.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/28 - 字.png b/wb_new_ui/assets/Common/font/font_gameTableName/28 - 字.png new file mode 100644 index 00000000..06dad3f7 Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/28 - 字.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/29 - 牌.png b/wb_new_ui/assets/Common/font/font_gameTableName/29 - 牌.png new file mode 100644 index 00000000..364a2b16 Binary files /dev/null and b/wb_new_ui/assets/Common/font/font_gameTableName/29 - 牌.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/3 - 3.png b/wb_new_ui/assets/Common/font/font_gameTableName/3 - 3.png index 66f6b1b5..097b43d2 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/3 - 3.png and b/wb_new_ui/assets/Common/font/font_gameTableName/3 - 3.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/4 - 4.png b/wb_new_ui/assets/Common/font/font_gameTableName/4 - 4.png index a2b4236c..d4066cdb 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/4 - 4.png and b/wb_new_ui/assets/Common/font/font_gameTableName/4 - 4.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/5 - 5.png b/wb_new_ui/assets/Common/font/font_gameTableName/5 - 5.png index e1b61928..5a23fbbe 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/5 - 5.png and b/wb_new_ui/assets/Common/font/font_gameTableName/5 - 5.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/6 - 6.png b/wb_new_ui/assets/Common/font/font_gameTableName/6 - 6.png index a4703498..8d5e3bdb 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/6 - 6.png and b/wb_new_ui/assets/Common/font/font_gameTableName/6 - 6.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/7 - 7.png b/wb_new_ui/assets/Common/font/font_gameTableName/7 - 7.png index 9e9da01c..e3914c87 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/7 - 7.png and b/wb_new_ui/assets/Common/font/font_gameTableName/7 - 7.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/8 - 8.png b/wb_new_ui/assets/Common/font/font_gameTableName/8 - 8.png index a7193c0c..891f5c18 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/8 - 8.png and b/wb_new_ui/assets/Common/font/font_gameTableName/8 - 8.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/9 - 9.png b/wb_new_ui/assets/Common/font/font_gameTableName/9 - 9.png index 027a8323..657adc3a 100644 Binary files a/wb_new_ui/assets/Common/font/font_gameTableName/9 - 9.png and b/wb_new_ui/assets/Common/font/font_gameTableName/9 - 9.png differ diff --git a/wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt b/wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt index 7cd5d6e6..f672c095 100644 --- a/wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt +++ b/wb_new_ui/assets/Common/font/font_gameTableName/font_gameTableName.fnt @@ -1,25 +1,31 @@ info size=200 resizable=true colored=false -char id=48 img=u50h7j1b xoffset=0 yoffset=0 xadvance=0 -char id=49 img=u50h7j1v xoffset=0 yoffset=0 xadvance=0 -char id=32418 img=u50h7j1u xoffset=0 yoffset=0 xadvance=0 -char id=20013 img=u50h7j1t xoffset=0 yoffset=0 xadvance=0 -char id=40635 img=u50h7j1s xoffset=0 yoffset=0 xadvance=0 -char id=23558 img=u50h7j1r xoffset=0 yoffset=0 xadvance=0 -char id=36716 img=u50h7j1q xoffset=0 yoffset=0 xadvance=0 -char id=36305 img=u50h7j1p xoffset=0 yoffset=0 xadvance=0 -char id=24471 img=u50h7j1o xoffset=0 yoffset=0 xadvance=0 -char id=24555 img=u50h7j1n xoffset=0 yoffset=0 xadvance=0 -char id=25918 img=u50h7j1w xoffset=0 yoffset=0 xadvance=0 -char id=28846 img=u50h7j1m xoffset=0 yoffset=0 xadvance=0 -char id=50 img=u50h7j1k xoffset=0 yoffset=0 xadvance=0 -char id=32602 img=u50h7j1j xoffset=0 yoffset=0 xadvance=0 -char id=25226 img=u50h7j1i xoffset=0 yoffset=0 xadvance=0 -char id=32467 img=u50h7j1h xoffset=0 yoffset=0 xadvance=0 -char id=46 img=u50h7j1y xoffset=0 yoffset=0 xadvance=0 -char id=51 img=u50h7j1g xoffset=0 yoffset=0 xadvance=0 -char id=52 img=u50h7j1f xoffset=0 yoffset=0 xadvance=0 -char id=53 img=u50h7j1e xoffset=0 yoffset=0 xadvance=0 -char id=54 img=u50h7j1d xoffset=0 yoffset=0 xadvance=0 -char id=55 img=u50h7j1c xoffset=0 yoffset=0 xadvance=0 -char id=56 img=u50h7j1l xoffset=0 yoffset=0 xadvance=0 -char id=57 img=u50h7j1x xoffset=0 yoffset=0 xadvance=0 +char id=48 img=kra57j7d xoffset=0 yoffset=0 xadvance=0 +char id=49 img=kra57j84 xoffset=0 yoffset=0 xadvance=0 +char id=32418 img=kra57j7v xoffset=0 yoffset=0 xadvance=0 +char id=20013 img=kra57j7u xoffset=0 yoffset=0 xadvance=0 +char id=40635 img=kra57j7t xoffset=0 yoffset=0 xadvance=0 +char id=23558 img=kra57j7s xoffset=0 yoffset=0 xadvance=0 +char id=36716 img=kra57j7r xoffset=0 yoffset=0 xadvance=0 +char id=36305 img=kra57j7q xoffset=0 yoffset=0 xadvance=0 +char id=24471 img=kra57j7p xoffset=0 yoffset=0 xadvance=0 +char id=24555 img=kra57j7o xoffset=0 yoffset=0 xadvance=0 +char id=25918 img=kra57j7n xoffset=0 yoffset=0 xadvance=0 +char id=28846 img=kra57j7m xoffset=0 yoffset=0 xadvance=0 +char id=50 img=kra57j83 xoffset=0 yoffset=0 xadvance=0 +char id=32602 img=kra57j7l xoffset=0 yoffset=0 xadvance=0 +char id=25226 img=kra57j7k xoffset=0 yoffset=0 xadvance=0 +char id=32467 img=kra57j7j xoffset=0 yoffset=0 xadvance=0 +char id=46 img=kra57j7i xoffset=0 yoffset=0 xadvance=0 +char id=27827 img=kra57j7h xoffset=0 yoffset=0 xadvance=0 +char id=27744 img=kra57j7g xoffset=0 yoffset=0 xadvance=0 +char id=32993 img=kra57j7f xoffset=0 yoffset=0 xadvance=0 +char id=23376 img=kra57j7e xoffset=0 yoffset=0 xadvance=0 +char id=23383 img=kra57j85 xoffset=0 yoffset=0 xadvance=0 +char id=29260 img=kra57j86 xoffset=0 yoffset=0 xadvance=0 +char id=51 img=kra57j82 xoffset=0 yoffset=0 xadvance=0 +char id=52 img=kra57j81 xoffset=0 yoffset=0 xadvance=0 +char id=53 img=kra57j80 xoffset=0 yoffset=0 xadvance=0 +char id=54 img=kra57j7z xoffset=0 yoffset=0 xadvance=0 +char id=55 img=kra57j7y xoffset=0 yoffset=0 xadvance=0 +char id=56 img=kra57j7x xoffset=0 yoffset=0 xadvance=0 +char id=57 img=kra57j7w xoffset=0 yoffset=0 xadvance=0 diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index ae838649..20f2d2f6 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -1433,31 +1433,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1644,6 +1619,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml index d66d760e..3e8f00d8 100644 --- a/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml +++ b/wb_new_ui/assets/Extend_Poker_HeChi/component/clearing/clearing.xml @@ -7,6 +7,7 @@ + @@ -29,33 +30,26 @@ - - - - - + - - - - - - + + + + + + + + + - - - - - - - + @@ -64,8 +58,8 @@ - - + + @@ -76,15 +70,15 @@ - + - - - - - - + + + + + + @@ -119,12 +113,21 @@ - + + + + + + + + + + diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml index fd96110c..d56eeb97 100644 --- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml +++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml @@ -1,13 +1,13 @@ - + - + @@ -48,7 +48,7 @@ - + diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml index 928e1c40..1e0d823c 100644 --- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml +++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml @@ -5,8 +5,16 @@ - - + + + + + + + + + + @@ -17,7 +25,7 @@ - + diff --git a/wb_new_ui/assets/Main_RunBeard/component/cards/Btn_Card.xml b/wb_new_ui/assets/Main_RunBeard/component/cards/Btn_Card.xml index a325bef9..9db2ce28 100644 --- a/wb_new_ui/assets/Main_RunBeard/component/cards/Btn_Card.xml +++ b/wb_new_ui/assets/Main_RunBeard/component/cards/Btn_Card.xml @@ -1,20 +1,23 @@ - + - + - + + - - + + + + + - + - +