From 1f09dc8e5b74ca6373ae10d50c28d63ff71ab31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=AE=B6=E7=82=9C?= <2029049582@qq.com>
Date: Sun, 29 Jun 2025 23:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E7=94=BB=E9=9D=A2=E6=9B=B4?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../extend/zipai/fanpaofa/EXMainView.lua | 12 ++++------
wb_new_ui/.objs/metas/0khx14ar/e0py2.info | 6 +++++
wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info | 3 +++
wb_new_ui/assets/Hotupdate/Version.xml | 22 ++++++++++++++----
.../commpoent/GlobalModalWaiting.xml | 14 +++++++++++
.../Hotupdate/commpoent/component/loading.xml | 16 +++++++++++++
.../Hotupdate/commpoent/font/images/光.png | Bin 0 -> 10994 bytes
.../commpoent/font/images/加载圈(1).png | Bin 0 -> 2472 bytes
.../commpoent/font/images/加载底(1).png | Bin 0 -> 39992 bytes
.../commpoent/font/images/图标.png | Bin 0 -> 3434 bytes
wb_new_ui/assets/Hotupdate/package.xml | 6 +++++
wb_new_ui/assets/Login/Main.xml | 1 -
.../Main_RunBeard/component/Main/Main_2.xml | 10 ++++----
.../component/Main/RoomInfoPanel1.xml | 6 ++---
14 files changed, 75 insertions(+), 21 deletions(-)
create mode 100644 wb_new_ui/assets/Hotupdate/commpoent/GlobalModalWaiting.xml
create mode 100644 wb_new_ui/assets/Hotupdate/commpoent/component/loading.xml
create mode 100644 wb_new_ui/assets/Hotupdate/commpoent/font/images/光.png
create mode 100644 wb_new_ui/assets/Hotupdate/commpoent/font/images/加载圈(1).png
create mode 100644 wb_new_ui/assets/Hotupdate/commpoent/font/images/加载底(1).png
create mode 100644 wb_new_ui/assets/Hotupdate/commpoent/font/images/图标.png
diff --git a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
index 2ab414db..981fe1cd 100644
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
@@ -425,13 +425,11 @@ function M:EventInit()
-- info:ResetCards(card)
if seat == self._room.self_player.seat then
if seat == self._room.self_player.seat then
- local buttonData = info.outcard_button
- local context = {}
- context.sender = buttonData.btn_card
- context.sender.data = buttonData
- context.sender.y = -300
- context.sender.touchable = true
- info:__OnDragEnd(context)
+ info.outcard_button.btn_card.touchable = true
+ info.outcard_button.btn_card.sortingOrder = 0
+ info.outcard_button.btn_card:GetChild("icon").icon = self:getCardItem(
+ "ui://Main_RunBeard/201_", card)
+ info:UpdateHandCardsPos()
info:UpdateIsOnClick(true)
end
end
diff --git a/wb_new_ui/.objs/metas/0khx14ar/e0py2.info b/wb_new_ui/.objs/metas/0khx14ar/e0py2.info
index 11074b7a..15a59a1f 100644
--- a/wb_new_ui/.objs/metas/0khx14ar/e0py2.info
+++ b/wb_new_ui/.objs/metas/0khx14ar/e0py2.info
@@ -1,5 +1,8 @@
{
"objectStatus": {
+ "n2": {
+ "hidden": true
+ },
"n28_thxk": {
"hidden": true
},
@@ -8,6 +11,9 @@
},
"n18_nld2": {
"hidden": true
+ },
+ "n20_nld2": {
+ "hidden": true
}
},
"adaptiveTest": true,
diff --git a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
index 3d14a8aa..d468bc8b 100644
--- a/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
+++ b/wb_new_ui/.objs/metas/v6yvqp7w/f55qvx.info
@@ -1,5 +1,8 @@
{
"objectStatus": {
+ "n48_cphv": {
+ "collapsed": true
+ },
"n45_j34t": {
"collapsed": true
}
diff --git a/wb_new_ui/assets/Hotupdate/Version.xml b/wb_new_ui/assets/Hotupdate/Version.xml
index 40f8e77d..13e89ecd 100644
--- a/wb_new_ui/assets/Hotupdate/Version.xml
+++ b/wb_new_ui/assets/Hotupdate/Version.xml
@@ -3,7 +3,7 @@
-
+
@@ -11,14 +11,16 @@
-
-
+
+
-
+
-
+
+
+
@@ -32,5 +34,15 @@
+
+
+
+
+
+ KNOmlCi7u7;U5$Dhg+)Z
z3)p*J|KbDgCWZU$3wqR%goWynDTY{i)(h=Q*J_Uhwj=G&e-OSV3r?xo2s-1bULH6a_k}J+C49GGP94*juq#3&VP|9j#gy7qlFOrpy}nml
z79pFuf!MlnnN^F5^$!gskGun+8NT${PnKD=xe0ataTHY@ytR?N`{rN<(@p?3jLh;{
zLx*CIYhYA--JF3)4eL8-R;uXCOJZ`|0PiL8>myyz&(5*
zMLCloFp8nG4;~QUz8x-ZB1H`q=s2yB-e9=Wo~=0Z*mtQ53dRrVG!yvR70*H3M`JDf
zc4dzJS<&cGj%M0WY%A-vA&LMe0Rv5s*_j4G9(6u0-uo=Hb5Jgo;Bs(!O?r$yJfA+bGJ;8&8oCejO@^{Yv
ztIy(&^h#Iul?w&wypo!2;?hxa%HAj$OrWUXkW#7W&g?vy>8haEflBi#th8QAN2G=<
z!+ei;wxn`eNlXWja(xRwrRH@5NF)Y!H%cfNV=VRdGNLzvCO>&V-pESvc{oyURCKCeB~oe$>-3
z58~Uh#SLH95(>Wa*tRxd6k)BNGy35QIL)(8xAqo%wpBO7eo}Sb%suUp7B>C~IV4T-
zr+@uwfRcGOChXYN*4E+_@s-tw*(#4Y6_@u>*LArL#qt!nJr)?_F1D=B0gcYS_=6pR
ziF-G%A3c`1UU3dDZ#6_!Rb6``3gw}y1VkO>0_Gz~)0qxWD8wVO#y)PeLjO`OHDnu&
zJz$K!lx=P2(x{8O4fUQXYev+m{4*MNfJ=3k5Oc2HmZiG|yR{zj-vWaoTAUMz_!On0
z5r!6s|2hAi++I*%8aL-_NRVHmx9i_EY|LTks=wk5pUb+Uhcj}Yq=W?corRO~cQaCD
z_(D#xD30}%uThGpyF?S?$*)}GgQjB8Xr8*XfkV81b67+5jdN4=cgtOEREk=g`qQ06
zyRpe{0{FIAW0nxmA(f?BJSL6K6~(|3XtTuQ!;(#Gs$B>>&YqQHrLuG1UR1*
zQR4%u`5@~12$VVY$pX-t`%S+eLVQ5wTdjKJKT~iMH3+PWTjUF#99W`RuZ4n-b(Peq
z@^A3p6}5=|vLROtGt?EFEbpgT4+u7Y;QmN(712QfQD$k%T_=|?4@3ytR!Z?|t@1D+
zv(W>!RPqPKp0T5OvPM_trc09(>IryR|JVnS*gP;S^3R43L#cM@tV~q1)%eW7#PgQ_
zj_AOHAXidsfzM!G^^nlCg_!2RPo|xq{hvpYFj1Wcbp@lYDZB&;-1ZGH%PkE(f5^Ec
z`Ukul&Z?!h^mP@UnI!?ZF$m-?)&%WXuT9H{vL+@j+XRLgV7J0;gPOGl#^e0b!k=3_
zUm;*DLEi?dZTeY(q1dT`&kAFv89i7CoRA%+(0BqnXmd8!N3?mSmdh&@$)~SaEAfOL
z_ym80IH!{C7aB;*R!SmlC)np#w+Jq5xT)_i;640dJTSH$ElXzdB(tuT{DihYC}51s
zC@@f{4WDn(4aYlH{o^uHF`<`;d*9K)GM5vR8<460rXYTj{3(VN@Oq$-L=_tUW}wAl
z-)o5a4b%|n%gg}c+*T>qSF|#y|;UU`qbH#`!X0cn*q9R+PYawGj5WS^ROPW@jX6
zY`(`TC{7PJ9jNmw9}sv-VxS39APtxILp+Ces%tFzJ}q2`k3YAPSgQ=cnmp0}}GhQ14tt
zj0SZOSw-r2QeCX%Uu=53XuEgmomado4kEdl5_(@Hcn!H>YQv($^6?%?6WKHBe^X*l
zyDw#j2&fPqiebf&k%r8KH*OGENL@*mz~AOxQ|XrGl3b5BkI_p4+m>!U7**a3mi;8j
zQUX_!E?c>fTumRp^GoDb_Watuon`1lj@QfDbeSt^q4C`gCMf8a)v=q0Tf)=N&fVqZ
z*;f68%J*t%&gr%i9-e~~DIKiDVZLT6a-DpTQGl@VeytyB?w`&;OJkEu8#^#(JT+$d
zh28D>C*dPO{;n*iqy5NKEEi;a2u-99skpW^QL`%JnfBv9TXRFczkw9oHgDm}tBqDs
z7;9!f4Yd$iwuadErkt(Ny$eztwtGc643EU2n1S)XZtCitHc$_pC@Zvcv*4}!UrhX!
zWE@j(pQ{2IOBn6{dG?~j^gg~d_1UE9?+8E)s?XRaW85Bg9`>Y&4Zb+PA;;9~j(=H0
zKYz8GkzU_Am}oMo@acz2A$-T1r-zsW>7aEgYQ5zbs;?dUUI?)!V!s>N9M}|dvH~%y
zulh}zR}io->LKZ-rtYHG&}+v&D6ua5C_6EF5UOTjfA+C=U8&IpE>nZ!VgshWEyF@&
zrh{gGwQ>cnM7gQKkJtv&6>vCgZ`7N&m||jGqfmsU4Dg}>57=~rb~tl(>!plHZO%SE
z&-D>q_A8uA63k~x630J3e~wL6H4meeCuK+z1qv#23GJ^AC;Bf30GqQ{RhYhFSg-$lNPYYlgUJZg;6A{51&*
zUutIp2TniSeVOCYKa&+oi06LgjAtGFig!YnPX&g?GK1Z0+#SIFNaAv~ngp3Bq;j=1
zB}HefrdI!1V*zvfGTY59+q?W2Lh-mov`%|Qk^@?C+1*`D6F#mLAXzxP*+N^h1N#r9
zYm1loV0fNKetR6^Tc5EO8yk>{evRi4sVf9$6#oQHi_cE=X4G?=$R%wg
zCs=+R0p+o`uCb1#T(RHREMA`<`YmP5HYQ_#rG{U(aq+gkNXab7%Ll{A27(Ts(D*NC
zqZxiP!qwlRBId;1Xc$0g?O=ls$Y*bulmZ_0q3o$i=fp#UOtR94`h^4-1nADu&t=xW
zmi@r-rCvZ|B}LU%?k;2o&0NQ<(zx;E?P*~56-o|zbP~U&dq+R~s5sbgI*PnVoJS;c
z`inLAcgO*U^hoTD9M5}h8nrDiS%EQV*+<8nKkKcdfD^+|N}#90kw4_na(PxMx-*rug1
z_TH84`pbi$1HEt?fsI!x7(4Yoe&R(w->NeJE~f_$#OJHHhjEq;1BV0Jt+&mKh`kaU
z`>L^(VN1b*i}UL>VA0%3$y~XrEE8RF9(vDDI!N4O>yrYlT4$ve)Z8uf27K!M_^<=+o`NJ8RXXnf
zHvr}=OE{I68I!+;*MpicFXLHNev83nkws?O3~fD43^9
zc9r5qcR_cr!{<3DsOSMplV1{gI^}ln>>0wmegWfil*Fgjv1`KWn`<}BYiU2XYa2X&
zN}|1+6Tv6!I~F$!^Xt!X_YwENt&Nhgoat?QYjiiuQ+7EkhhW6Bg7slvx5B_4VFi0n
zG}T9gm0LOQAJSk0E`yyW>%O2ba*FwKhAB9KsOgTpdBBv*1%9JTzC8H|#NA*_v
zb!(Kr*Hf~etZ(TKYpf3q9vPha@5Zn!c2HHrNVD_8|Uj)bW7w0J$lyep&1
z@s9NicL1~$s}9Ae+9dIFh!~h-ELu35uh)VOXhiQ-Q9Uu5C#0b)4(Ot9lq5;PoXcHN
zpp=TvrtQ@Fe8Kd_&F3gv&a($LoV#M6WqT73is-JQ!=^6W%NL030n34RrTP6CJ^tBn
zu;04Qiubo3p}$kma%0fSo3D%tM~9^0L#?#Mmh4m=A5jwSAxf%!RYpA@cQkZt$@}Hq
z7N7yH!o8iti;mG2Tf3#wYL~YXmt{YkuApRRiSoZ!D^!;}@2o)OXJJSQj+F}vgIPQQ
z&?T&L>N
zsMJl_(HNuXf?H1>;pTJNpJ<)11fkH!e!s%
zj&vXlH~T45rcC(?>Ddnb=OaLJv}WD0mJJOA$i&=T!;EOardK9+ibUI1pt?xp*>dP4?9K8bZz_R
zZeAMGYg|MR^tme@xRhv`YM?HLZ1dV&ufIwziw7b-=omQw(w(1u0n
zAV=-pYMajI(5{BRdK-?=KB@kylVt;6yoVnw#SMa3L6TKd#n2#gfF)1-t+D<@Ddyvf
z4+$$*%r8l*VO&swPM6alVO`NCz7{%)R*cAZpI$Cnsf@2X1EuJ!FO+YBr4npcUq$m%
zj7o7)wu-vI)MT_+`dMN)w^}*g=hnD><@VN4<6wjPY4<&fPlb`it+;txw>WmJ9xYG{
zZPnS(cu#gD0O@F>@PN^^yY!nEg$L5#sr7ap#_F|zUd%>}Hmi$w%U^jrQ^a;Du
zD+vHN!zMal0SDmA)mG!S7rAG2`;~2HXhu=dH$rN|(OR+{GG4|4QnJcY!p=jDo2u4J
zsNo1eq1dI?8i%22PHSX*P`P)QuQf<1f}navlE@QC>Ls9v4@Ak|P3CQ)1a<+$5wx;m
zkPLT=C&QwUg~(wld{wDDpR8zhltHHn8>6;K-%(v?fr(cFnvWE#L|kf}}5
z4fD@v#j&OSOj^i6Lf;1(YqDoA-0MW`bMkvWkF>RAS?SR!OW0zm02*OK-OBx;z98uj
zaU1Rb1iUCZh6{UVU~>8K^U#RT3Xz71K`n%?Ky6{bvbf)iwRyl0W