From 1aca2cab85f97a68f94f6565170d329d9a42c899 Mon Sep 17 00:00:00 2001
From: 1076390229 <1076390229@qq.com>
Date: Thu, 12 Mar 2026 16:23:18 +0800
Subject: [PATCH] 2

---
 .../extend/zipai/fanpaofa/main/HuTipView.lua  |  17 ++++++++++++++---
 .../component/clearing/clearing.xml           |  14 +++++++-------
 .../Main_RunBeard/component/HuTip/Hu_Tip.xml  |   2 +-
 .../Main/component/Player_card_info_2.xml     |   2 +-
 .../chi_peng_effect/Btn_pass_new.xml          |   2 +-
 .../main_zipai/ui/Main_RunBeard_fui.bytes     | Bin 178614 -> 178614 bytes
 .../ui/Extend_Poker_FanPaoFa_fui.bytes        | Bin 142212 -> 142212 bytes
 7 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua
index f847d2d5..bde21037 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua
@@ -43,7 +43,7 @@ function M:init()
 	self._view.x = 0.115 * m_width --- 0.5 * width
 	--self._view.x = 0
 	-- self._view.y = 0.65 * m_height
-	self._view.y = 0.65 * m_height
+	self._view.y = 0.5 * m_height
 	SetObjEnabled(self._view, false)
 	self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
 	self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
@@ -54,8 +54,19 @@ function M:FillData(cards)
 	lst_card:RemoveChildrenToPool()
 	local num = #cards
 	local n0 = self._view:GetChild("n0")
-	n0.height = 130
-	n0.width = 76 * #cards + 150
+	if #cards < 4 then
+		n0.width = (#cards * 76) * 3 + 150
+	else
+		n0.width = (1 * 76) * 3 + 200
+	end
+	local numC = #cards / 4
+	if numC ~= math.floor(numC) then
+		numC = math.floor(numC) + 1
+	end
+
+	n0.height = numC * 130
+	print("00000=======111==" .. numC)
+
 	if num > 0 then
 		if num > 4 and num < 28 then
 			self._view.width = 191 + ((num > 4 and 6 or num) - 3) * 38
diff --git a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
index 5094cabd..f3c63b99 100644
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="over" pages="0,,1,,2,,3," selected="2"/>
-  <controller name="button" pages="0,,1," selected="1"/>
+  <controller name="over" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="button" pages="0,,1," selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="owner" pages="0,,1," selected="0"/>
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="qipai" pages="0,,1," selected="0"/>
-  <controller name="xipai" pages="0,,1," selected="1"/>
+  <controller name="xipai" pages="0,,1," selected="0"/>
   <controller name="hudianpao" pages="0,,1,,2," selected="0"/>
   <displayList>
     <component id="n102_efhz" name="win_base" xy="469,1529" size="1334,750" group="n70_dunj"/>
@@ -30,7 +30,7 @@
     <text id="n49_g8y2" name="n49" xy="473,602" size="457,74" group="n70_dunj" visible="false" fontSize="18" color="#999999" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
       <gearDisplay controller="over" pages="1"/>
     </text>
-    <component id="n6_jt1k" name="btn_share_str" src="ufu90" fileName="buttons/Btn_Blue.xml" xy="442,617" size="233,90" group="n51_fmkv">
+    <component id="n6_jt1k" name="btn_share_str" src="ufu90" fileName="buttons/Btn_Blue.xml" xy="575,619" size="233,90" group="n51_fmkv">
       <gearDisplay controller="sdk" pages="0"/>
       <gearXY controller="button" pages="0,1" values="575,619|442,617"/>
       <Button icon="ui://1utjt0r2ufu91q"/>
@@ -39,12 +39,12 @@
       <gearDisplay controller="over" pages="1"/>
       <Button icon="ui://1utjt0r2ufu92m"/>
     </component>
-    <component id="n65_pwj4" name="btn_share" src="ufu90" fileName="buttons/Btn_Blue.xml" xy="442,617" size="233,90" group="n51_fmkv" visible="false">
+    <component id="n65_pwj4" name="btn_share" src="ufu90" fileName="buttons/Btn_Blue.xml" xy="346,619" size="233,90" group="n51_fmkv" visible="false">
       <gearDisplay controller="sdk" pages="0"/>
       <gearXY controller="button" pages="0,1" values="346,619|442,617"/>
       <Button icon="ui://1utjt0r2ufu91p"/>
     </component>
-    <group id="n51_fmkv" name="n51" xy="442,617" size="524,90" group="n70_dunj" advanced="true">
+    <group id="n51_fmkv" name="n51" xy="346,619" size="620,90" group="n70_dunj" advanced="true">
       <gearDisplay controller="over" pages="1"/>
     </group>
     <component id="n66_pwj4" name="btn_close" src="ufu98" fileName="buttons/Btn_close.xml" xy="1706,27" size="87,92" group="n70_dunj" controller="style,0">
@@ -184,7 +184,7 @@
       <gearDisplay controller="over" pages="2"/>
     </text>
     <component id="n71_dunj" name="big_result" src="ufu930" fileName="component/clearing/result_zipai_main.xml" xy="-10,4">
-      <gearDisplay controller="over" pages="3" />
+      <gearDisplay controller="over" pages="3"/>
     </component>
   </displayList>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml b/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml
index 15897156..cdeabca1 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml
@@ -5,7 +5,7 @@
       <relation target="" sidePair=""/>
       <relation target="n1_lyf1" sidePair="width-width,height-height"/>
     </image>
-    <list id="n1_lyf1" name="tingpai" xy="59,16" pivot="0,0.5" size="159,58" touchable="false" layout="flow_hz" lineGap="8" colGap="5" lineItemCount="5" defaultItem="ui://lkq9ne9speuq2s"/>
+    <list id="n1_lyf1" name="tingpai" xy="59,16" pivot="0,0.5" size="159,58" touchable="false" layout="flow_hz" lineGap="8" colGap="5" lineItemCount="4" defaultItem="ui://lkq9ne9speuq2s"/>
   </displayList>
   <Button/>
 </component>
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
index 4367cadb..39127028 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
@@ -2,7 +2,7 @@
 <component size="200,750" opaque="false" initName="player_card_info">
   <displayList>
     <list id="n47_lr5d" name="area_fz_list" xy="84,31" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="18" align="right" vAlign="bottom"/>
-    <list id="n48_lr5d" name="windcard_list" xy="84,1" size="535,530" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw" vAlign="bottom"/>
+    <list id="n48_lr5d" name="windcard_list" xy="84,-98" size="535,530" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw" vAlign="bottom"/>
     <component id="n50_n1ry" name="mask_liangpai" src="peuq59" fileName="component/Component1.xml" xy="200,83" size="5,5"/>
     <component id="n25" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="534,79" size="930,319" touchable="false"/>
     <component id="n51_n7o4" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="227,230" size="717,533" touchable="false"/>
diff --git a/wb_new_ui/assets/Main_RunBeard/component/chi_peng_effect/Btn_pass_new.xml b/wb_new_ui/assets/Main_RunBeard/component/chi_peng_effect/Btn_pass_new.xml
index f792ab3c..b4e370ba 100644
--- a/wb_new_ui/assets/Main_RunBeard/component/chi_peng_effect/Btn_pass_new.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/chi_peng_effect/Btn_pass_new.xml
@@ -2,7 +2,7 @@
 <component size="260,260" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n9_x8lf" name="n9" src="peuqo" fileName="component/chi_peng_effect/newop.png" xy="3,28" size="180,180"/>
+    <image id="n9_x8lf" name="n9" src="peuqo" fileName="component/chi_peng_effect/newop.png" xy="3,47" size="180,180"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="0.8"/>
 </component>
\ No newline at end of file
diff --git a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
index 4bf6803cf407ccdec8c5725e6d7617083ab09a4a..b10764488f13149bb642da9d25080837e34da352 100644
GIT binary patch
delta 38
wcmV+>0NMYx^9r`}3b6cu0R*%CfV)ow|NsA<v%JuJ+W{|!IjjM<IjjPG4W!Hy%m4rY

delta 38
wcmV+>0NMYx^9r`}3b6cu0R^-DfV)ow00001v%JuJ+W{PhIjjM<IjjPG4P8kPAOHXW

diff --git a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes
index 2b4ba1fd8c72c9cc0a2564fc46786b736fdb4549..be0dccaaa675964b1d3909c33b54c48e8cc5176e 100644
GIT binary patch
delta 167
zcmZp<&e3w6W5aPdHYR%p2Bz%EXXQTfMS)n13=9k}fjDY%qQB_mhw|xgVWu3g@In*C
z&E*R7Sows3TuqSjcp&zeywF5!a)LI?WLq_k$^H>ClM~fc_$q)htUx8q96&}PR0-?m
lb!ur4?I1bMVxYVrP)>1rw-Te^Wc^&B<}{t{X*!H@{{cJ}ClCMt

delta 167
zcmZp<&e3w6W5aPdHpX2H3{07m&&qw|1G5+z7#Lmxan$5Qf6>Vg<<sH9Ogv!Wg(ixd
z%N6Fa@@WFO%pm1$Kx{pEp^4b!1Z|edwrU)c3%O+`C#tFNX#-^(fJ&Gvfed4)64uS@
j)Y1^zIb(tH!azC2>D@|<f|K=gg__fJwx{VZ%KZlbynQF+