lingmeng
/
changhong_newclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1110

master
罗家炜 2025-11-10 02:25:12 +08:00
parent 8a439914d8
commit e31af96f0e
21 changed files with 63 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua
View File

@ -94,13 +94,14 @@ function M:InitData(over, room, result, total_result, callback)
local round = DataManager.CurrenRoom.room_config.config.times or 1 local round = DataManager.CurrenRoom.room_config.config.times or 1
local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai local xpconfig = DataManager.CurrenRoom.room_config.config.xi_pai
--默认开启洗牌准备，不管配置是否勾选
xpconfig = true
if xpconfig and round > 1 then if xpconfig and round > 1 then
self.xiPaiCtr.selectedIndex = 1 self.xiPaiCtr.selectedIndex = 1
else else
self.xiPaiCtr.selectedIndex = 0 self.xiPaiCtr.selectedIndex = 0
end end
if result then if result then
self:ShowSelectMaPai(result.niao) self:ShowSelectMaPai(result.niao)
end end
@ -175,6 +176,8 @@ function M:InitData(over, room, result, total_result, callback)
end) end)
self:AddClearItem(room, nil, total_result.info_list, over) self:AddClearItem(room, nil, total_result.info_list, over)
end end
self.xiPaiCtr.selectedIndex = 1
printlog("lingmeng xipai ", self.xiPaiCtr.selectedIndex)
end end
function M:AddClearItem(room, data, total_data, over, niao, active_player) function M:AddClearItem(room, data, total_data, over, niao, active_player)

BIN
qyq_new_unity/Assets/ART/base/ui/Extend_Poker_FanPaoFa_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

BIN
wb_new_ui/assets/Extend_Poker_FanPaoFa_bar/component/clearing/洗牌.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 50 KiB

4
wb_new_ui/assets/Extend_Poker_RunFastNew/component/Btn_Yellow.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="184,85" extention="Button"> <component size="184,85" extention="Button">
<displayList> <displayList>
<loader id="n2" name="icon" xy="0,0" size="184,85" align="center" vAlign="middle"> <loader id="n2" name="icon" xy="0,0" size="184,85" align="center" vAlign="middle" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</loader> </loader>
</displayList> </displayList>
<Button downEffect="dark" downEffectValue="0.80"/> <Button downEffect="dark" downEffectValue="0.8"/>
</component> </component>

BIN
wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 715.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/Group 7216.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 50 KiB

8
wb_new_ui/assets/Extend_Poker_RunFastNew/component/Result/clearing.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1334,750"> <component size="1334,750">
<controller name="sdk" pages="0,,1," selected="1"/> <controller name="sdk" pages="0,,1," selected="1"/>
<controller name="result" pages="0,,1," selected="0"/> <controller name="result" pages="0,,1," selected="1"/>
<controller name="xipai" pages="0,,1," selected="1"/> <controller name="xipai" pages="0,,1," selected="1"/>
<displayList> <displayList>
<graph id="n42_ndir" name="n42" xy="-427,-182" size="2189,1114" alpha="0.65" type="rect" fillColor="#ff000000"> <graph id="n42_ndir" name="n42" xy="-427,-182" size="2189,1114" alpha="0.65" type="rect" fillColor="#ff000000">
@ -79,12 +79,12 @@
<text id="n61_in2f" name="n61" xy="186,559" size="134,36" group="n47_m5rj" font="Microsoft YaHei" fontSize="26" color="#9c471f" bold="true" text="剩余的牌："> <text id="n61_in2f" name="n61" xy="186,559" size="134,36" group="n47_m5rj" font="Microsoft YaHei" fontSize="26" color="#9c471f" bold="true" text="剩余的牌：">
<relation target="" sidePair="left-left%"/> <relation target="" sidePair="left-left%"/>
</text> </text>
<component id="n44_p0nj" name="btn_confirm" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="273,477" size="288,85" group="n47_m5rj"> <component id="n44_p0nj" name="btn_confirm" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="273,468" size="230,80" group="n47_m5rj">
<gearDisplay controller="sdk" pages="1"/> <gearDisplay controller="sdk" pages="1"/>
<gearXY controller="xipai" pages="0,1" values="523,468|273,477"/> <gearXY controller="xipai" pages="0,1" values="523,468|273,468"/>
<Button icon="ui://9n9stu2eimp5ciy"/> <Button icon="ui://9n9stu2eimp5ciy"/>
</component> </component>
<component id="n51_hxjc" name="btn_xipai" src="hxjccif" fileName="component/clearing/room/btn_invite(1).xml" xy="756,475" size="304,105" group="n47_m5rj"> <component id="n51_hxjc" name="btn_xipai" src="hxjccif" fileName="component/clearing/room/btn_invite(1).xml" xy="809,456" size="275,113" group="n47_m5rj">
<gearDisplay controller="xipai" pages="1"/> <gearDisplay controller="xipai" pages="1"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<Button titleColor="#000000" titleFontSize="30" icon="ui://9n9stu2eimp5cjg"/> <Button titleColor="#000000" titleFontSize="30" icon="ui://9n9stu2eimp5cjg"/>

18
wb_new_ui/assets/Extend_Poker_RunFastNew/component/RunFast_Main_2.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1334,750" designImageAlpha="100" designImageLayer="1"> <component size="1334,750" designImageAlpha="100" designImageLayer="1">
<controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="1"/> <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="1"/>
<controller name="sdk" pages="0,,1," selected="0"/> <controller name="sdk" pages="0,,1," selected="1"/>
<controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/> <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="2"/>
<controller name="time" pages="0,,1,,2,,3," selected="0"/> <controller name="time" pages="0,,1,,2,,3," selected="3"/>
<controller name="card_eff" pages="0,,1," selected="0"/> <controller name="card_eff" pages="0,,1," selected="0"/>
<controller name="zidongtishi" pages="0,,1," selected="0"/> <controller name="zidongtishi" pages="0,,1," selected="1"/>
<controller name="showBtn" pages="0,,1," selected="0"/> <controller name="showBtn" pages="0,,1," selected="1"/>
<displayList> <displayList>
<component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="-208,2" alpha="0"> <component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="-208,4" alpha="0">
<gearDisplay controller="state" pages="1"/> <gearDisplay controller="state" pages="1"/>
<gearLook controller="state" pages="0,2,3" values="0,0,0,1|0,0,0,1|0,0,0,1" default="0,0,0,1"/> <gearLook controller="state" pages="0,2,3" values="0,0,0,1|0,0,0,1|0,0,0,1" default="0,0,0,1"/>
</component> </component>
@ -56,13 +56,13 @@
<gearXY controller="time" pages="1,2" values="171,315|1133,63" default="625,198"/> <gearXY controller="time" pages="1,2" values="171,315|1133,63" default="625,198"/>
<relation target="" sidePair="left-left%,top-top%"/> <relation target="" sidePair="left-left%,top-top%"/>
</component> </component>
<component id="n129_thxk" name="btn_daNiao" src="thxkcis" fileName="component/Result/btn_daNiao.xml" xy="235,386" size="285,109" group="n131_z1ae"> <component id="n129_thxk" name="btn_daNiao" src="thxkcis" fileName="component/Result/btn_daNiao.xml" xy="775,394" size="285,109" group="n131_z1ae">
<gearDisplay controller="action" pages="3"/> <gearDisplay controller="action" pages="3"/>
</component> </component>
<component id="n130_thxk" name="btn_buDaNiao" src="thxkcit" fileName="component/Result/btn_buDaNiao.xml" xy="813,386" size="285,109" group="n131_z1ae"> <component id="n130_thxk" name="btn_buDaNiao" src="thxkcit" fileName="component/Result/btn_buDaNiao.xml" xy="325,394" size="285,109" group="n131_z1ae">
<gearDisplay controller="action" pages="3"/> <gearDisplay controller="action" pages="3"/>
</component> </component>
<group id="n131_z1ae" name="startGameBtn" xy="235,386" size="863,109" advanced="true"> <group id="n131_z1ae" name="startGameBtn" xy="325,394" size="735,109" advanced="true">
<gearDisplay controller="state" pages="1"/> <gearDisplay controller="state" pages="1"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
</group> </group>

34
wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1050,200" opaque="false" initName="player_card_info"> <component size="1050,200" opaque="false" initName="player_card_info">
<controller name="output" pages="0,,1,,2," selected="0"/> <controller name="output" pages="0,,1,,2," selected="2"/>
<controller name="out_card_option" pages="0,,1,,2," selected="1"/> <controller name="out_card_option" pages="0,,1,,2," selected="2"/>
<controller name="put_error" pages="0,,1," selected="0"/> <controller name="put_error" pages="0,,1," selected="1"/>
<controller name="piao" pages="0,,1,,2,,3," selected="0"/> <controller name="piao" pages="0,,1,,2,,3," selected="0"/>
<controller name="piao_value" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/> <controller name="piao_value" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
<displayList> <displayList>
@ -12,17 +12,17 @@
<list id="n46_sdax" name="out_card_list" xy="115,-196" size="874,120" layout="row" colGap="-50" autoItemSize="false" align="center" vAlign="middle"> <list id="n46_sdax" name="out_card_list" xy="115,-196" size="874,120" layout="row" colGap="-50" autoItemSize="false" align="center" vAlign="middle">
<gearDisplay controller="output" pages="1"/> <gearDisplay controller="output" pages="1"/>
</list> </list>
<component id="n49_g618" name="btn_put" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="664,-174" size="566,223" group="n51_g618" scale="0.6,0.6"> <component id="n49_g618" name="btn_put" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="664,-150" size="360,136" group="n51_g618" scale="0.6,0.6">
<Button icon="ui://9n9stu2else5chc"/> <Button icon="ui://9n9stu2else5chc"/>
</component> </component>
<component id="n48_g618" name="btn_not_put" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="42,-394" group="n51_g618" scale="1.1,1.1"> <component id="n48_g618" name="btn_not_put" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="42,-303" group="n51_g618" scale="1.1,1.1">
<gearDisplay controller="out_card_option" pages="1"/> <gearDisplay controller="out_card_option" pages="1"/>
<Button icon="ui://9n9stu2else5chb"/> <Button icon="ui://9n9stu2else5chb"/>
</component> </component>
<component id="n50_g618" name="btn_tips" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="18,-174" size="565,223" group="n51_g618" scale="0.6,0.6"> <component id="n50_g618" name="btn_tips" src="m9jaha" fileName="component/Btn_Yellow.xml" xy="93,-150" size="360,136" group="n51_g618" scale="0.6,0.6">
<Button icon="ui://9n9stu2else5chd"/> <Button icon="ui://9n9stu2else5chd"/>
</component> </component>
<group id="n51_g618" name="btn" xy="18,-394" size="1212,443" advanced="true"> <group id="n51_g618" name="btn" xy="42,-303" size="982,289" advanced="true">
<gearDisplay controller="out_card_option" pages="1,2"/> <gearDisplay controller="out_card_option" pages="1,2"/>
<relation target="" sidePair="bottom-top,left-right"/> <relation target="" sidePair="bottom-top,left-right"/>
</group> </group>
@ -35,34 +35,34 @@
<text id="n57_pgkj" name="Score" xy="-146,0" size="144,51" alpha="0" font="Microsoft YaHei" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text=""/> <text id="n57_pgkj" name="Score" xy="-146,0" size="144,51" alpha="0" font="Microsoft YaHei" fontSize="30" color="#ffffff" align="center" vAlign="middle" autoSize="none" text=""/>
<text id="n60_8yp0" name="area_mask" xy="464,-573" size="358,389" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;outcard_list&quot;:{&#xA; &quot;parent&quot;:&quot;hand_poker_c&quot;,&#xA; &quot;obj&quot;:&quot;poker7&quot;,&#xA; &quot;maxcount_x&quot;:16,&#xA; &quot;start_x&quot;:-42,&#xA; &quot;start_y&quot;:0&#xA; }&#xA;}"/> <text id="n60_8yp0" name="area_mask" xy="464,-573" size="358,389" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;outcard_list&quot;:{&#xA; &quot;parent&quot;:&quot;hand_poker_c&quot;,&#xA; &quot;obj&quot;:&quot;poker7&quot;,&#xA; &quot;maxcount_x&quot;:16,&#xA; &quot;start_x&quot;:-42,&#xA; &quot;start_y&quot;:0&#xA; }&#xA;}"/>
<component id="n61_agiz" name="mask_liangpai" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="320,-220" size="5,5"/> <component id="n61_agiz" name="mask_liangpai" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="320,-220" size="5,5"/>
<component id="n68_i3h6" name="piao0" src="i3h6gy" fileName="component/piao/btn_nopiao.xml" xy="66,-185" group="n63_i3h6"> <component id="n68_i3h6" name="piao0" src="i3h6gy" fileName="component/piao/btn_nopiao.xml" xy="82,-298" group="n63_i3h6">
<gearDisplay controller="piao" pages="1,2,3"/> <gearDisplay controller="piao" pages="1,2,3"/>
<Button controller="piao_value" page="0"/> <Button controller="piao_value" page="0"/>
</component> </component>
<component id="n62_i3h6" name="piao1" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="299,-185" group="n63_i3h6"> <component id="n62_i3h6" name="piao1" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="315,-298" group="n63_i3h6">
<gearDisplay controller="piao" pages="1"/> <gearDisplay controller="piao" pages="1"/>
<Button icon="ui://9n9stu2ei3h6gr" selectedIcon="ui://9n9stu2ei3h6gr" controller="piao_value" page="1"/> <Button icon="ui://9n9stu2ei3h6gr" selectedIcon="ui://9n9stu2ei3h6gr" controller="piao_value" page="1"/>
</component> </component>
<component id="n64_i3h6" name="piao2" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="492,-185" group="n63_i3h6"> <component id="n64_i3h6" name="piao2" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="508,-298" group="n63_i3h6">
<gearDisplay controller="piao" pages="1,2,3"/> <gearDisplay controller="piao" pages="1,2,3"/>
<gearXY controller="piao" pages="0,1,2,3" values="492,-185|532,-185|299,-185|299,-185"/> <gearXY controller="piao" pages="0,1,2,3" values="508,-298|532,-185|299,-185|299,-185"/>
<Button icon="ui://9n9stu2ei3h6gs" selectedIcon="ui://9n9stu2ei3h6gs" controller="piao_value" page="2"/> <Button icon="ui://9n9stu2ei3h6gs" selectedIcon="ui://9n9stu2ei3h6gs" controller="piao_value" page="2"/>
</component> </component>
<component id="n65_i3h6" name="piao3" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="725,-185" group="n63_i3h6"> <component id="n65_i3h6" name="piao3" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="741,-298" group="n63_i3h6">
<gearDisplay controller="piao" pages="1,2"/> <gearDisplay controller="piao" pages="1,2"/>
<gearXY controller="piao" pages="0,1,2" values="725,-185|765,-185|532,-185" default="725,-185"/> <gearXY controller="piao" pages="0,1,2" values="741,-298|765,-185|532,-185" default="725,-185"/>
<Button icon="ui://9n9stu2ei3h6gt" selectedIcon="ui://9n9stu2ei3h6gt" controller="piao_value" page="3"/> <Button icon="ui://9n9stu2ei3h6gt" selectedIcon="ui://9n9stu2ei3h6gt" controller="piao_value" page="3"/>
</component> </component>
<component id="n66_i3h6" name="piao5" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="492,-185" group="n63_i3h6"> <component id="n66_i3h6" name="piao5" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="508,-298" group="n63_i3h6">
<gearDisplay controller="piao" pages="2,3"/> <gearDisplay controller="piao" pages="2,3"/>
<gearXY controller="piao" pages="0,1,2,3" values="492,-185|532,-185|765,-185|532,-185"/> <gearXY controller="piao" pages="0,1,2,3" values="508,-298|532,-185|765,-185|532,-185"/>
<Button icon="ui://9n9stu2ei3h6gu" selectedIcon="ui://9n9stu2ei3h6gu" controller="piao_value" page="4"/> <Button icon="ui://9n9stu2ei3h6gu" selectedIcon="ui://9n9stu2ei3h6gu" controller="piao_value" page="4"/>
</component> </component>
<component id="n67_i3h6" name="piao8" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="765,-185" group="n63_i3h6"> <component id="n67_i3h6" name="piao8" src="i3h6gq" fileName="component/piao/btn_piao.xml" xy="781,-298" group="n63_i3h6">
<gearDisplay controller="piao" pages="3"/> <gearDisplay controller="piao" pages="3"/>
<Button icon="ui://9n9stu2ei3h6gv" selectedIcon="ui://9n9stu2ei3h6gv" controller="piao_value" page="5"/> <Button icon="ui://9n9stu2ei3h6gv" selectedIcon="ui://9n9stu2ei3h6gv" controller="piao_value" page="5"/>
</component> </component>
<group id="n63_i3h6" name="piao" xy="66,-185" size="917,103"/> <group id="n63_i3h6" name="piao" xy="82,-298" size="917,103"/>
</displayList> </displayList>
<transition name="score"> <transition name="score">
<item time="0" type="Alpha" target="n57_pgkj" tween="true" startValue="0" endValue="1" duration="18"/> <item time="0" type="Alpha" target="n57_pgkj" tween="true" startValue="0" endValue="1" duration="18"/>

4
wb_new_ui/assets/Extend_Poker_RunFastNew/component/clearing/room/btn_invite(1).xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="292,105" extention="Button"> <component size="292,105" extention="Button">
<displayList> <displayList>
<loader id="n2_ti0x" name="icon" xy="19,15" size="247,71" url="ui://27vd145bf40a7i6a" align="center" vAlign="middle"> <loader id="n2_ti0x" name="icon" xy="19,15" size="247,71" url="ui://27vd145bf40a7i6a" align="center" vAlign="middle" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</loader> </loader>
<text id="n3_oqvx" name="title" xy="0,-5" size="292,104" fontSize="34" align="center" vAlign="middle" autoSize="none" bold="true" text=""> <text id="n3_oqvx" name="title" xy="0,-5" size="292,104" fontSize="34" align="center" vAlign="middle" autoSize="none" bold="true" text="">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</text> </text>
</displayList> </displayList>
<Button downEffect="dark" downEffectValue=".8"/> <Button downEffect="dark" downEffectValue="0.8"/>
</component> </component>

46
wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="1334,750" bgColorEnabled="true"> <component size="1334,750" bgColorEnabled="true">
<controller name="over" pages="0,,1," selected="1"/> <controller name="over" pages="0,,1," selected="0"/>
<controller name="button" pages="0,,1," selected="0"/> <controller name="button" pages="0,,1," selected="0"/>
<controller name="sdk" pages="0,,1," selected="0"/> <controller name="sdk" pages="0,,1," selected="0"/>
<controller name="type" pages="0,,1,,2,,3,,4," selected="0"/> <controller name="type" pages="0,,1,,2,,3,,4," selected="0"/>
@ -9,7 +9,7 @@
<controller name="matypeshow" pages="0,,1," selected="0"/> <controller name="matypeshow" pages="0,,1," selected="0"/>
<controller name="matypebgshow" pages="0,,1," selected="0"/> <controller name="matypebgshow" pages="0,,1," selected="0"/>
<controller name="paixing" pages="0,,1," selected="0"/> <controller name="paixing" pages="0,,1," selected="0"/>
<controller name="xipai" pages="0,,1," selected="0"/> <controller name="xipai" pages="0,,1," selected="1"/>
<displayList> <displayList>
<component id="n20_pt1r" name="win_base" pkg="lxhyy2sd" src="e6awcd0" fileName="Win_Frame_Old.xml" xy="0,0" size="1334,750"/> <component id="n20_pt1r" name="win_base" pkg="lxhyy2sd" src="e6awcd0" fileName="Win_Frame_Old.xml" xy="0,0" size="1334,750"/>
<image id="n31_piv9" name="bg" src="gq7mcg" fileName="component/clearing/clearing1/lk.png" xy="-78,0" size="1497,750" visible="false"> <image id="n31_piv9" name="bg" src="gq7mcg" fileName="component/clearing/clearing1/lk.png" xy="-78,0" size="1497,750" visible="false">
@ -19,67 +19,67 @@
<gearIcon controller="type" pages="0,1,2,3,4" values="ui://v0j9abjygq7me9|ui://v0j9abjygq7mea|ui://v0j9abjygq7meb|ui://v0j9abjygq7mec|ui://v0j9abjygq7mch"/> <gearIcon controller="type" pages="0,1,2,3,4" values="ui://v0j9abjygq7me9|ui://v0j9abjygq7mea|ui://v0j9abjygq7meb|ui://v0j9abjygq7mec|ui://v0j9abjygq7mch"/>
<relation target="" sidePair="center-center,top-top"/> <relation target="" sidePair="center-center,top-top"/>
</loader> </loader>
<list id="n3_fux2" name="player_list_1" xy="0,114" size="1334,517" group="n29_10imx" lineGap="10" defaultItem="ui://v0j9abjygq7mcu" autoItemSize="false" align="center" vAlign="middle"> <list id="n3_fux2" name="player_list_1" xy="1,114" size="1334,517" group="n29_10imx" lineGap="10" defaultItem="ui://v0j9abjygq7mcu" autoItemSize="false" align="center" vAlign="middle">
<gearDisplay controller="over" pages="0"/> <gearDisplay controller="over" pages="0"/>
<item/> <item/>
<item/> <item/>
</list> </list>
<text id="n34_piv9" name="tex_gameinfo" xy="1,6" size="425,56" group="n36_piv9" font="Microsoft YaHei" fontSize="20" color="#ffffff" vAlign="middle" autoSize="shrink" bold="true" text="大夫看见撒地方就阿斯蒂芬啊收到了附件啊收到了附件阿斯蒂芬就撒地方空间撒地方空间撒地方就士大夫看见撒地方就阿斯蒂芬"/> <text id="n34_piv9" name="tex_gameinfo" xy="2,6" size="425,56" group="n36_piv9" font="Microsoft YaHei" fontSize="20" color="#ffffff" vAlign="middle" autoSize="shrink" bold="true" text="大夫看见撒地方就阿斯蒂芬啊收到了附件啊收到了附件阿斯蒂芬就撒地方空间撒地方空间撒地方就士大夫看见撒地方就阿斯蒂芬"/>
<text id="n35_piv9" name="tex_roominfo" xy="892,3" size="437,70" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" vAlign="middle" autoSize="shrink" bold="true" text="房号123456 局10/16 2019-10-7 09:24:10&#xA;"/> <text id="n35_piv9" name="tex_roominfo" xy="893,3" size="437,70" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" vAlign="middle" autoSize="shrink" bold="true" text="房号123456 局10/16 2019-10-7 09:24:10&#xA;"/>
<group id="n36_piv9" name="room_info" xy="1,3" size="1331,70" group="n29_10imx" advanced="true"> <group id="n36_piv9" name="room_info" xy="2,3" size="1331,70" group="n29_10imx" advanced="true">
<relation target="" sidePair=""/> <relation target="" sidePair=""/>
</group> </group>
<text id="n22_xtwh" name="n22" xy="22,712" size="400,27" group="n29_10imx" visible="false" fontSize="18" color="#624720" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/> <text id="n22_xtwh" name="n22" xy="23,712" size="400,26" group="n29_10imx" visible="false" fontSize="18" color="#624720" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
<component id="n12_nrno" name="btn_showResult" src="gq7me7" fileName="component/clearing/room/btn_invite.xml" xy="542,671" size="247,67" group="n29_10imx"> <component id="n12_nrno" name="btn_showResult" src="gq7me7" fileName="component/clearing/room/btn_invite.xml" xy="543,671" size="247,67" group="n29_10imx">
<gearDisplay controller="button" pages="1"/> <gearDisplay controller="button" pages="1"/>
<Button icon="ui://v0j9abjygq7mcj"/> <Button icon="ui://v0j9abjygq7mcj"/>
</component> </component>
<component id="n4_fux2" name="btn_confirm" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="758,638" group="n28_xhvg"> <component id="n4_fux2" name="btn_confirm" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="824,649" size="230,80" group="n28_xhvg">
<gearDisplay controller="button" pages="0"/> <gearDisplay controller="button" pages="0"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<Button icon="ui://v0j9abjygq7mci"/> <Button icon="ui://v0j9abjygq7mci"/>
</component> </component>
<component id="n62_ona1" name="btn_detal" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="469,640" group="n28_xhvg"> <component id="n62_ona1" name="btn_detal" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="465,641" group="n28_xhvg">
<gearDisplay controller="button" pages="0"/> <gearDisplay controller="button" pages="0"/>
<gearXY controller="paixing" pages="0,1" values="469,640|1038,653"/> <gearXY controller="paixing" pages="0,1" values="465,641|1038,653"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<Button icon="ui://v0j9abjygq7mda"/> <Button icon="ui://v0j9abjygq7mda"/>
</component> </component>
<component id="n104_ux6x" name="btn_fanhuipaixing" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="469,640" group="n28_xhvg"> <component id="n104_ux6x" name="btn_fanhuipaixing" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="465,641" group="n28_xhvg">
<gearDisplay controller="button" pages="0"/> <gearDisplay controller="button" pages="0"/>
<gearXY controller="paixing" pages="0,1" values="469,640|1038,653"/> <gearXY controller="paixing" pages="0,1" values="465,641|1038,653"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<Button icon="ui://v0j9abjygq7mdh"/> <Button icon="ui://v0j9abjygq7mdh"/>
</component> </component>
<component id="n109_nlef" name="btn_xipai" src="nlefsr" fileName="buttons/btn_xp.xml" xy="1109,648" size="230,80" group="n28_xhvg"> <component id="n109_nlef" name="btn_xipai" src="a81dsp" fileName="buttons/btn_xipai.xml" xy="1106,649" size="230,80" group="n28_xhvg">
<gearDisplay controller="xipai" pages="1"/> <gearDisplay controller="xipai" pages="1"/>
<relation target="" sidePair="right-right"/> <relation target="" sidePair="center-center"/>
</component> </component>
<group id="n28_xhvg" name="n28" xy="469,638" size="870,107" group="n24_gfyh" advanced="true"> <group id="n28_xhvg" name="n28" xy="465,641" size="870,105" group="n24_gfyh" advanced="true">
<gearDisplay controller="over" pages="0"/> <gearDisplay controller="over" pages="0"/>
</group> </group>
<component id="n63_uwvl" name="btn_maima" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="485,638" size="320,105" group="n65_uwvl"> <component id="n63_uwvl" name="btn_maima" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="481,639" size="320,105" group="n65_uwvl">
<gearDisplay controller="matype" pages="1"/> <gearDisplay controller="matype" pages="1"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<Button icon="ui://v0j9abjygq7mdc"/> <Button icon="ui://v0j9abjygq7mdc"/>
</component> </component>
<component id="n64_uwvl" name="btn_jiangma" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="202,640" size="320,105" group="n65_uwvl"> <component id="n64_uwvl" name="btn_jiangma" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="198,641" size="320,105" group="n65_uwvl">
<gearDisplay controller="matype" pages="1"/> <gearDisplay controller="matype" pages="1"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<Button icon="ui://v0j9abjygq7mdb"/> <Button icon="ui://v0j9abjygq7mdb"/>
</component> </component>
<component id="n103_e0b9" name="btn_fama" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="485,638" size="320,105" group="n65_uwvl"> <component id="n103_e0b9" name="btn_fama" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="481,639" size="320,105" group="n65_uwvl">
<gearDisplay controller="matype" pages="1"/> <gearDisplay controller="matype" pages="1"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
<Button icon="ui://v0j9abjygq7mdg"/> <Button icon="ui://v0j9abjygq7mdg"/>
</component> </component>
<group id="n65_uwvl" name="n65" xy="202,638" size="603,107" group="n24_gfyh" advanced="true"> <group id="n65_uwvl" name="n65" xy="198,639" size="603,107" group="n24_gfyh" advanced="true">
<gearDisplay controller="over" pages="0"/> <gearDisplay controller="over" pages="0"/>
</group> </group>
<group id="n24_gfyh" name="btns" xy="202,638" size="1137,107" group="n29_10imx" advanced="true"> <group id="n24_gfyh" name="btns" xy="198,639" size="1137,107" group="n29_10imx" advanced="true">
<gearXY controller="over" pages="0,1" values="195,639|202,638"/> <gearXY controller="over" pages="0,1" values="198,639|199,638"/>
</group> </group>
<group id="n29_10imx" name="n29" xy="0,3" size="1338,742" advanced="true"> <group id="n29_10imx" name="n29" xy="1,3" size="1334,743" advanced="true">
<gearDisplay controller="over" pages="0"/> <gearDisplay controller="over" pages="0"/>
<relation target="" sidePair="center-center"/> <relation target="" sidePair="center-center"/>
</group> </group>

BIN
wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/jiesuan_btx_jxyx.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 46 KiB

4
wb_new_ui/assets/Main_Majiang/component/clearing/room/btn_invite(1).xml
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component size="292,105" extention="Button"> <component size="292,105" extention="Button">
<displayList> <displayList>
<loader id="n2_ti0x" name="icon" xy="0,0" size="292,105" aspect="true" url="ui://v0j9abjygq7mdi" align="center" vAlign="middle"> <loader id="n2_ti0x" name="icon" xy="0,0" size="292,105" aspect="true" url="ui://v0j9abjygq7mdi" align="center" vAlign="middle" fill="scaleFree">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</loader> </loader>
<text id="n3_oqvx" name="title" xy="0,0" size="292,104" fontSize="34" align="center" vAlign="middle" autoSize="none" text=""> <text id="n3_oqvx" name="title" xy="0,0" size="292,104" fontSize="34" align="center" vAlign="middle" autoSize="none" text="">
<relation target="" sidePair="width-width,height-height"/> <relation target="" sidePair="width-width,height-height"/>
</text> </text>
</displayList> </displayList>
<Button downEffect="dark" downEffectValue=".8"/> <Button downEffect="dark" downEffectValue="0.8"/>
</component> </component>

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 MiB

After

Width:  |  Height:  |  Size: 1.9 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

BIN
wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
View File

Binary file not shown.

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 463 KiB

After

Width:  |  Height:  |  Size: 492 KiB

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_atlas0_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 MiB

After

Width:  |  Height:  |  Size: 3.0 MiB

BIN
wb_unity_pro/Assets/ART/extend/poker/runfast/ui/Extend_Poker_RunFastNew_fui.bytes
View File

Binary file not shown.