替换福禄寿界面ui

fk101/wb_new_ui/.objs/fonts.json

@@ -41,8 +41,6 @@ ui://3n2top74kpmgp6
 ui://3n2top74kpmgi
 ui://3n2top74kpmg8h
 ui://3n2top74kpmg8u
-ui://9n9stu2enaueci9
-ui://9n9stu2enauecht
 ui://awernf6xbazq7b
 ui://awernf6xbazq7a
 ui://qpsoxvainaueci9
@@ -67,20 +65,10 @@ ui://3z9lj55vjokml9
 ui://3z9lj55vjokmm9
 ui://3z9lj55vjokmfx
 ui://3z9lj55vjokm7m
-ui://v0j9abjygq7m7
-ui://v0j9abjygq7mw
-ui://v0j9abjygq7mk
-ui://v0j9abjygq7m19
-ui://v0j9abjygq7m3l
-ui://v0j9abjygq7m53
-ui://v0j9abjygq7m34
-ui://v0j9abjygq7m6k
-ui://v0j9abjygq7mhi
 ui://4skil1l6vmtu1kv
 ui://4skil1l6vmtu1l8
 ui://4skil1l6piv91ln
 ui://4skil1l6jsw9117
 ui://5cdldr01qaqf72
 ui://5cdldr01qaqf9d
-ui://35sf1c1fr05e8v
 ui://m7iejg46gjxx7iab

fk101/wb_new_ui/.objs/metas/yzaioi79/voqg1dy.info

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n85_fgao": {
+      "hidden": true
+    },
     "n86_fgao": {
       "hidden": true
     },
@@ -7,6 +10,9 @@
       "hidden": true,
       "collapsed": true
     },
+    "n80_fgao": {
+      "hidden": true
+    },
     "n54_mk2u": {
       "hidden": true,
       "collapsed": true

fk101/wb_new_ui/.objs/workspace.json

@@ -1,6 +1,5 @@
 {
   "libview.firstColumnWidth": 356,
-  "test.device": "Xiaomi 9",
   "libview.iconScale": 0,
   "doc.openedDocs": [
     "ui://27vd145bhxjc7i4q",
@@ -16,7 +15,6 @@
     "ui://oubpz2r2ofil7k",
     "ui://442j0uepygxga",
     "ui://3n2top74kpmgkd",
-    "ui://9n9stu2eprgzee",
     "ui://awernf6xbazq7n",
     "ui://qpsoxvaiprgzee",
     "ui://b8jloj2qg8ktcmb",
@@ -32,6 +30,38 @@
     "ui://425x67nrs9wx7",
     "ui://kplym8mus9wx7",
     "ui://3z9lj55vjokmft",
+    "ui://ypulwxjhl9mn37",
+    "ui://c7j2rnvqtpf08x",
+    "ui://fnuxqeflkllg1x",
+    "ui://egnzysm7ffp3b2",
+    "ui://v2hilfzbgq7me6",
+    "ui://k15boclkl9mn37",
+    "ui://oubpz2r2ofil8x",
+    "ui://442j0uepdafga8",
+    "ui://3n2top74kpmgmh",
+    "ui://awernf6xbazq90",
+    "ui://qpsoxvaiprgzf0",
+    "ui://b8jloj2qprgzf0",
+    "ui://3op8sm5eu86s3p",
+    "ui://niy3ldiwl9mn37",
+    "ui://3z9lj55vjokmwr",
+    "ui://3z9lj55vjokm7l",
+    "ui://4skil1l6ms5spy",
+    "ui://4skil1l6r6qo1kc",
+    "ui://5cdldr01qaqf9c",
+    "ui://5cdldr01qaqfa4",
+    "ui://5cdldr01qaqfaw",
+    "ui://yzaioi79f55qwa",
+    "ui://yzaioi79f55qva",
+    "ui://yzaioi79f55qvp",
+    "ui://yzaioi79f55qvt",
+    "ui://yzaioi79f55qvn",
+    "ui://5cdldr01qaqfe0",
+    "ui://yzaioi79fgao1dn",
+    "ui://yzaioi79voqg1dy",
+    "ui://yzaioi79mk2u138",
+    "ui://27vd145bycze3m",
+    "ui://27vd145bkzpehy5",
     "ui://27vd145blwcl28",
     "ui://m7iejg46mpllhuq",
     "ui://3z9lj55vjokmet",
@@ -41,16 +71,20 @@
     "ui://4skil1l6piv91ny",
     "ui://niy3ldiwl9mny",
     "ui://niy3ldiwl9mn19",
-    "ui://9n9stu2eprgzei",
-    "ui://9n9stu2eprgzef",
     "ui://27vd145bpgy941"
   ],
-  "auxline1": true,
+  "test.device": "Xiaomi 9",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://27vd145blwcl28",
+  "doc.activeDoc": "ui://yzaioi79f55qwa",
   "libview.twoColumn": false,
-  "libview.expandedNodes": [],
+  "libview.expandedNodes": [
+    "yzaioi79",
+    "/",
+    "yzaioi79",
+    "/component/"
+  ],
+  "auxline1": true,
   "snapToGrid": true,
   "test.orientation": "landscape",
   "backgroundColor": 6710886,

fk101/wb_new_ui/assets/Common/buttons/Btn_Yellow.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="184,85" extention="Button">
+<component size="400,169" extention="Button">
   <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="400,169" align="center" vAlign="middle">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>

fk101/wb_new_ui/assets/Common/component/game/btn_ready.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="251,114" extention="Button">
+<component size="400,169" extention="Button">
   <displayList>
-    <image id="n0_kzpe" name="n0" src="ghnx7ik0" fileName="component/game/zb.png" xy="-1,7"/>
+    <image id="n0_kzpe" name="n0" src="tlmy7il9" fileName="conMui/Group 518(1).png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

fk101/wb_new_ui/assets/Common/package.xml

@@ -1146,6 +1146,17 @@
     <component id="loe77il6" name="Btn_closeMm1.xml" path="/buttons/" exported="true"/>
     <image id="iss87il7" name="Group 522111.png" path="/conMui/"/>
     <image id="iss87il8" name="Group 521111.png" path="/conMui/"/>
+    <image id="tlmy7il9" name="Group 518(1).png" path="/conMui/"/>
+    <image id="tlmy7ila" name="Group 520.png" path="/conMui/"/>
+    <image id="tlmy7ilb" name="Frame 1138.png" path="/conMui/" exported="true"/>
+    <image id="tlmy7ilc" name="Frame 1140.png" path="/conMui/" exported="true"/>
+    <image id="tlmy7ild" name="Frame 1239.png" path="/conMui/" exported="true"/>
+    <image id="tlmy7ile" name="Rectangle 5573.png" path="/conMui/" exported="true"/>
+    <image id="tlmy7ilf" name="Rectangle 579.png" path="/conMui/" exported="true"/>
+    <image id="tlmy7ilg" name="Rectangle 5529.png" path="/conMui/" exported="true"/>
+    <image id="tlmy7ilh" name="Rectangle 5528.png" path="/conMui/" exported="true"/>
+    <image id="tlmy7ili" name="设置.png" path="/conMui/" exported="true"/>
+    <image id="tlmy7ilj" name="Frame 260.png" path="/conMui/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/Main_2.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1172" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
-  <controller name="action" pages="2,空,0,准备,1,洗牌" selected="0"/>
+  <controller name="action" pages="2,空,0,准备,1,洗牌" selected="2"/>
-  <controller name="jushu" pages="0,,1," selected="1"/>
+  <controller name="jushu" pages="0,,1," selected="0"/>
-  <controller name="bg_state" pages="0,,1,,2," selected="2"/>
+  <controller name="bg_state" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n177_cbxl" name="n177" src="60xf1g2" fileName="component/Main/images/zipai3.png" xy="1181,115">
       <gearDisplay controller="state" pages="1,3"/>
@@ -33,7 +33,7 @@
     <component id="n147_nu0l" name="player_info2" src="f55qw7" fileName="component/Main/component/PlayerHead_2.xml" xy="63,114" size="200,355">
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="49,767" size="200,336">
+    <component id="n7" name="player_info1" src="f55qw4" fileName="component/Main/component/PlayerHead_1.xml" xy="69,662" size="200,336">
       <gearXY controller="state" pages="0,1,2,3" values="69,662|49,767|54,675|48,570"/>
       <relation target="" sidePair="left-left"/>
     </component>
@@ -41,27 +41,27 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n34_k3io" name="btn_ready1" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="1158,648" group="n36_k3io" visible="false">
+    <component id="n34_k3io" name="btn_ready1" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="868,648" group="n36_k3io" visible="false">
       <gearDisplay controller="action" pages="0"/>
       <Button icon="ui://27vd145bk3io3u"/>
     </component>
-    <component id="n35_k3io" name="btn_start1" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="1158,648" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start1" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="868,648" group="n36_k3io" visible="false">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://27vd145bk3io3t"/>
     </component>
-    <component id="n169_o49p" name="btn_ready" src="kzpehy5" fileName="component/game/btn_ready.xml" pkg="27vd145b" xy="858,661" size="199,88" group="n36_k3io">
+    <component id="n169_o49p" name="btn_ready" src="kzpehy5" fileName="component/game/btn_ready.xml" pkg="27vd145b" xy="622,771" size="394,162" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
-      <Button icon="ui://27vd145bf7zuchl"/>
+      <Button icon="ui://27vd145btlmy7il9"/>
     </component>
-    <component id="n170_o49p" name="btn_start" src="rbz8chn" fileName="buttons/Btn_newYellow_long.xml" pkg="27vd145b" xy="1158,648" size="219,75" group="n36_k3io" visible="false">
+    <component id="n170_o49p" name="btn_start" src="rbz8chn" fileName="buttons/Btn_newYellow_long.xml" pkg="27vd145b" xy="868,648" size="219,75" group="n36_k3io" visible="false">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://27vd145bf7zuchk"/>
     </component>
-    <component id="n180_mncc" name="btn_xipai" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="1432,662" group="n36_k3io">
+    <component id="n180_mncc" name="btn_xipai" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="1520,771" size="390,162" group="n36_k3io">
       <gearDisplay controller="action" pages="1"/>
-      <Button icon="ui://27vd145bghnx7ik1"/>
+      <Button icon="ui://27vd145btlmy7ila"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="858,648" size="758,101" advanced="true">
+    <group id="n36_k3io" name="n36" xy="622,648" size="1288,285" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>
@@ -76,22 +76,22 @@
       <gearDisplay controller="state" pages="1,2"/>
       <relation target="" sidePair="left-left"/>
     </component>
-    <component id="n24" name="right_panel" src="f55qvt" fileName="component/Main/component/Folder/RightPanel.xml" xy="735,25" size="1059,86" group="n150_8th3">
+    <component id="n24" name="right_panel" src="f55qvt" fileName="component/Main/component/Folder/RightPanel.xml" xy="736,25" size="1059,86" group="n150_8th3">
       <gearDisplay controller="state" pages="0,1,2,3"/>
     </component>
-    <component id="n37_kba2" name="roominfo_panel1" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="812,7" size="332,80" group="n150_8th3" visible="false" touchable="false"/>
+    <component id="n37_kba2" name="roominfo_panel1" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="833,7" size="332,80" group="n150_8th3" visible="false" touchable="false"/>
-    <component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="811,12" size="322,80" group="n150_8th3" visible="false" touchable="false"/>
+    <component id="n31_h1uu" name="roominfo_panel" src="f55qwb" fileName="component/Main/RoomInfoPanel1.xml" xy="832,12" size="322,80" group="n150_8th3" visible="false" touchable="false"/>
-    <component id="n46_u4l2" name="btn_rule1" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="1131,4" size="106,29" group="n150_8th3" visible="false"/>
+    <component id="n46_u4l2" name="btn_rule1" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="1151,4" size="106,29" group="n150_8th3" visible="false"/>
-    <component id="n166_o49p" name="btn_back_lobby" src="f55qvp" fileName="component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml" xy="1824,31" size="73,73" group="n150_8th3">
+    <component id="n166_o49p" name="btn_back_lobby" src="f55qvp" fileName="component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml" xy="1876,21" size="73,99" group="n150_8th3">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <component id="n167_o49p" name="Btn_jiesan_lobby" src="oynr1ag" fileName="component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml" xy="1824,31" size="73,73" group="n150_8th3">
+    <component id="n167_o49p" name="Btn_jiesan_lobby" src="oynr1ag" fileName="component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml" xy="1845,31" size="73,73" group="n150_8th3">
       <gearDisplay controller="state" pages="1,2"/>
     </component>
-    <component id="n168_o49p" name="btn_setting" src="f55qva" fileName="component/Main/component/Folder/component/phone_info/Btn_setting.xml" xy="1914,31" size="73,73" group="n150_8th3">
+    <component id="n168_o49p" name="btn_setting" src="f55qva" fileName="component/Main/component/Folder/component/phone_info/Btn_setting.xml" xy="2005,21" size="60,100" group="n150_8th3">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
-    <group id="n150_8th3" name="n150" xy="735,4" size="1251,107" advanced="true">
+    <group id="n150_8th3" name="n150" xy="736,4" size="1329,117" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <image id="n152_8th3" name="n152" src="f55qvu" fileName="component/Main/images/di00.png" xy="976,-122" size="580,86" visible="false">
@@ -101,7 +101,7 @@
     <loader id="n153_8th3" name="cardAnima" xy="625,86" size="50,30" visible="false" touchable="false" url="ui://3bfrwj0h8th37l" autoSize="true">
       <gearDisplay controller="state" pages="1"/>
     </loader>
-    <component id="n57_rayb" name="panel_record" src="rayb5j" fileName="component/record/Record.xml" pkg="27vd145b" xy="836,425" scale="1.2,1.2" alpha="0.5">
+    <component id="n57_rayb" name="panel_record" src="rayb5j" fileName="component/record/Record.xml" pkg="27vd145b" xy="908,537" scale="1.2,1.2" alpha="0.5">
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="center-center"/>
     </component>
@@ -124,7 +124,7 @@
     <component id="n179_kxwj" name="btn_distance" src="kxwjhyc" fileName="component/gps/btn_distance_new.xml" pkg="27vd145b" xy="1746,16" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
-    <text id="n181_m093" name="di_text" xy="789,201" size="965,42" fontSize="30" color="#367c7d" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#235557" text="123456789">
+    <text id="n181_m093" name="di_text" xy="789,201" size="965,42" fontSize="30" color="#49925d" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#296137" text="123456789">
       <gearDisplay controller="state" pages="0,1,2"/>
       <gearColor controller="bg_state" pages="0,1" values="#49925d,#296137|#655c6a,#322e34" default="#367c7d,#235557"/>
       <relation target="" sidePair="center-center"/>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/RightPanel.xml

@@ -3,7 +3,7 @@
   <controller name="xinhao" pages="0,,1," selected="0"/>
   <controller name="log" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n31_o49p" name="n31" src="o49p1ca" fileName="component/Main/component/new_ui/up_bg_img.png" xy="0,0" size="1059,86" group="n19_qpk6"/>
+    <image id="n31_o49p" name="n31" src="tlmy7ile" fileName="conMui/Rectangle 5573.png" pkg="27vd145b" xy="0,0" size="1059,86" group="n19_qpk6"/>
     <image id="n21_mk2u" name="n21" src="mk2u14b" fileName="component/Main/component/Folder/images/new_sd_bg.png" xy="0,0" size="669,96" group="n19_qpk6" visible="false"/>
     <image id="n22_mk2u" name="n22" src="mk2u14a" fileName="component/Main/component/Folder/images/new_bg_hd.png" xy="91,7" size="416,35" group="n19_qpk6" visible="false"/>
     <component id="n20_qpk6" name="btn_log" src="f55qvn" fileName="component/Main/component/Folder/component/phone_info/Btn_log.xml" xy="544,21" size="180,44" group="n19_qpk6" aspect="true"/>
@@ -17,12 +17,12 @@
     </component>
     <text id="n7" name="tex_data" xy="154,11" size="64,34" group="n19_qpk6" visible="false" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="2017-07-09"/>
     <text id="n12_yyhx" name="tex_time" xy="733,12" size="141,62" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="46" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="19:30"/>
-    <text id="n24_mk2u" name="tex_gametype" xy="4,21" size="164,44" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="32" color="#cbcfb3" vAlign="middle" leading="0" text="衡阳十胡卡"/>
+    <text id="n24_mk2u" name="tex_gametype" xy="4,21" size="164,44" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="32" color="#ffffff" vAlign="middle" leading="0" text="衡阳十胡卡"/>
-    <text id="n27_o49p" name="tex_roomid" xy="171,21" size="154,44" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="32" color="#a4af57" vAlign="middle" autoSize="shrink" text="2345672">
+    <text id="n27_o49p" name="tex_roomid" xy="171,21" size="154,44" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="32" color="#18cded" vAlign="middle" autoSize="shrink" text="2345672">
       <relation target="n24_mk2u" sidePair="left-left"/>
     </text>
-    <text id="n28_o49p" name="tex_round22" xy="326,21" size="68,44" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="32" color="#cbcfb3" vAlign="middle" leading="0" autoSize="shrink" text="局数"/>
+    <text id="n28_o49p" name="tex_round22" xy="326,21" size="68,44" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="shrink" text="局数"/>
-    <text id="n29_o49p" name="tex_round" xy="397,21" size="135,44" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="32" color="#a4af57" vAlign="middle" leading="0" autoSize="shrink" text="">
+    <text id="n29_o49p" name="tex_round" xy="397,21" size="135,44" group="n19_qpk6" font="ui://27vd145bpxed7ik2" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="shrink" text="">
       <relation target="n28_o49p" sidePair="left-left"/>
     </text>
     <group id="n19_qpk6" name="n19" xy="0,-8" size="1059,104"/>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="73,73" extention="Button" initName="btn_back_lobby">
+<component size="65,105" extention="Button" initName="btn_back_lobby">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n3_hp0b" name="n3" src="f55qvq" fileName="component/Main/component/Folder/images/phone_info/game_icon_01.png" xy="5,0" pivot="0.5,0.5" size="50,48" aspect="true" visible="false"/>
     <text id="n4_8th3" name="n4" xy="0,55" size="59,34" visible="false" fontSize="20" color="#ffffff" align="center" autoSize="none" text="返回"/>
     <image id="n5_mk2u" name="n5" src="mk2u14d" fileName="component/Main/component/Folder/component/phone_info/new_lk.png" xy="6,10" visible="false"/>
-    <image id="n7_o49p" name="n7" src="o49p1c7" fileName="component/Main/component/new_ui/jiesan_img.png" xy="0,0" size="75,75"/>
+    <image id="n7_o49p" name="n7" src="tlmy7ilc" fileName="conMui/Frame 1140.png" pkg="27vd145b" xy="0,0" size="65,105"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/component/phone_info/Btn_log.xml

@@ -4,7 +4,7 @@
     <image id="n1" name="n1" src="f55qvo" fileName="component/Main/component/Folder/images/phone_info/chakan.png" xy="12,0" pivot="0.5,0.5" size="45,50" aspect="true" visible="false"/>
     <text id="n2_8th3" name="n2" xy="5,55" size="60,34" visible="false" fontSize="20" color="#ffffff" align="center" autoSize="none" text="说明"/>
     <image id="n3_mk2u" name="n3" src="mk2u14e" fileName="component/Main/component/Folder/component/phone_info/new_sm.png" xy="12,10" visible="false"/>
-    <image id="n5_cbxl" name="n5" src="cbxl1gd" fileName="component/Main/component/new_ui/玩法详情.png" xy="0,-5" size="185,56"/>
+    <image id="n5_cbxl" name="n5" src="tlmy7ild" fileName="conMui/Frame 1239.png" pkg="27vd145b" xy="0,-5" size="185,56"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/component/Folder/component/phone_info/Btn_setting.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="73,73" extention="Button">
+<component size="65,105" extention="Button">
   <displayList>
     <image id="n1" name="n1" src="f55qvb" fileName="component/Main/component/Folder/images/phone_info/shezhi.png" xy="10,0" pivot="0.5,0.5" size="50,50" aspect="true" visible="false"/>
     <text id="n2_8th3" name="n2" xy="5,55" size="59,34" visible="false" fontSize="20" color="#ffffff" align="center" autoSize="none" text="设置"/>
     <image id="n3_mk2u" name="n3" src="mk2u14f" fileName="component/Main/component/Folder/component/phone_info/new_sz.png" xy="12,10" visible="false"/>
-    <image id="n5_o49p" name="n5" src="o49p1cb" fileName="component/Main/component/new_ui/shezhi_img.png" xy="0,0" size="75,75"/>
+    <image id="n5_o49p" name="n5" src="tlmy7ilb" fileName="conMui/Frame 1138.png" pkg="27vd145b" xy="0,0" size="65,105"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/Main/setting/component/Slider1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="350,46" extention="Slider">
   <displayList>
-    <image id="n4_fgao" name="n4" src="fgao1dt" fileName="component/setting/images/newsetting/hdtd_img.png" xy="9,4" size="348,39"/>
+    <image id="n4_fgao" name="n4" src="tlmy7ilh" fileName="conMui/Rectangle 5528.png" pkg="27vd145b" xy="1,0" size="345,41"/>
     <image id="n1" name="n1" src="mk2u134" fileName="component/Main/setting/images/setting/hdtd.png" xy="0,0" size="348,41" visible="false"/>
-    <image id="n5_fgao" name="bar" src="fgao1du" fileName="component/setting/images/newsetting/jdt_img.png" xy="3,7" size="332,32"/>
+    <image id="n5_fgao" name="bar" src="tlmy7ilg" fileName="conMui/Rectangle 5529.png" pkg="27vd145b" xy="0,0" size="350,46"/>
     <image id="n2" name="bar1" src="mk2u135" fileName="component/Main/setting/images/setting/jdt.png" xy="7,11" size="332,21" visible="false"/>
-    <component id="n3" name="grip" src="mk2u139" fileName="component/Main/setting/component/Slider1_grip.xml" xy="305,-6">
+    <component id="n3" name="grip" src="mk2u139" fileName="component/Main/setting/component/Slider1_grip.xml" xy="320,-6">
       <relation target="n5_fgao" sidePair="right-right"/>
     </component>
   </displayList>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/New_SettingWindow.xml

@@ -4,11 +4,11 @@
   <controller name="bg" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <controller name="cards" pages="0,,1,,2,,3," selected="0"/>
   <controller name="size" pages="0,,1,,2," selected="0"/>
-  <controller name="fangyan" pages="0,,1," selected="0"/>
+  <controller name="fangyan" pages="0,,1," selected="1"/>
   <controller name="yuyin" pages="0,,1," selected="0"/>
   <controller name="chupai" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n82_fgao" name="n82" src="fgao1dq" fileName="component/setting/images/newsetting/dk_img.png" xy="0,0" size="605,754"/>
+    <image id="n82_fgao" name="n82" src="tlmy7ilf" fileName="conMui/Rectangle 579.png" pkg="27vd145b" xy="0,0" size="605,754"/>
     <graph id="n0_mk2u" name="btn_close" xy="-800,859" size="2548,1026" visible="false" touchable="false" type="rect" lineSize="0" fillColor="#00000000">
       <relation target="" sidePair="right-right"/>
     </graph>
@@ -27,13 +27,13 @@
       <Button icon="ui://v6yvqp7wmk2u132"/>
     </component>
     <component id="n97_voqg" name="btn_music" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="4,2" size="113,0" group="n102_voqg" visible="false"/>
-    <component id="n98_voqg" name="slider_sound" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="213,154" size="347,45" group="n102_voqg" visible="false">
+    <component id="n98_voqg" name="slider_sound" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="236,163" size="347,45" group="n102_voqg" visible="false">
       <Slider value="50" max="100"/>
     </component>
-    <component id="n101_voqg" name="slider_music" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="213,225" size="347,45" group="n102_voqg" visible="false">
+    <component id="n101_voqg" name="slider_music" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="236,234" size="347,45" group="n102_voqg" visible="false">
       <Slider value="50" max="100"/>
     </component>
-    <group id="n102_voqg" name="n102" xy="0,0" size="560,270" group="n135_voqg" advanced="true"/>
+    <group id="n102_voqg" name="n102" xy="0,0" size="583,279" group="n135_voqg" advanced="true"/>
     <list id="n95_voqg" name="lst_bg" xy="1230,1096" size="582,185" group="n135_voqg" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="35" colGap="50" lineItemCount="3" defaultItem="ui://yzaioi79mk2u130">
       <relation target="" sidePair="center-center"/>
     </list>
@@ -75,7 +75,7 @@
     <component id="n120_voqg" name="n120" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1650,1850" group="n122_voqg">
       <Button title="是" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <text id="n121_voqg" name="n121" xy="1265,1850" size="182,41" group="n122_voqg" fontSize="30" color="#624920" bold="true" text="禁止接收语音"/>
+    <text id="n121_voqg" name="n121" xy="1265,1850" size="184,42" group="n122_voqg" fontSize="30" color="#624920" bold="true" text="禁止接收语音"/>
     <group id="n122_voqg" name="n122" xy="1265,1850" size="508,47" group="n127_voqg"/>
     <component id="n123_voqg" name="n123" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1501,1784" group="n126_voqg">
       <Button checked="true" title="否" titleColor="#624720" titleFontSize="35"/>
@@ -83,7 +83,7 @@
     <component id="n124_voqg" name="n124" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1650,1784" group="n126_voqg">
       <Button title="是" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <text id="n125_voqg" name="n125" xy="1265,1788" size="182,41" group="n126_voqg" fontSize="30" color="#624920" bold="true" text="开启快速吃牌"/>
+    <text id="n125_voqg" name="n125" xy="1265,1788" size="184,42" group="n126_voqg" fontSize="30" color="#624920" bold="true" text="开启快速吃牌"/>
     <group id="n126_voqg" name="n126" xy="1265,1784" size="508,47" group="n127_voqg"/>
     <group id="n127_voqg" name="n127" xy="1265,1784" size="508,113" group="n135_voqg" advanced="true"/>
     <image id="n128_voqg" name="n128" src="fgao1do" fileName="component/setting/images/newsetting/szbt_img.png" xy="1364,767" group="n130_voqg"/>

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/setting/images/newsetting/Component5.xml

@@ -26,15 +26,15 @@
       <Button icon="ui://v6yvqp7wmk2u132"/>
     </component>
     <component id="n36_mk2u" name="btn_music" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="160,208" size="113,0" group="n41_mk2u" visible="false"/>
-    <component id="n38_mk2u" name="slider_sound" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="307,146" size="347,45" group="n41_mk2u">
+    <component id="n38_mk2u" name="slider_sound" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="329,154" size="347,45" group="n41_mk2u">
       <Slider value="50" max="100"/>
     </component>
-    <text id="n39_mk2u" name="n39" xy="140,219" size="149,47" group="n41_mk2u" fontSize="34" color="#5c3c16" text="背景音乐:"/>
+    <text id="n39_mk2u" name="n39" xy="140,219" size="177,54" group="n41_mk2u" font="ui://27vd145bpxed7ik2" fontSize="40" color="#0d1725" text="背景音乐:"/>
-    <text id="n40_mk2u" name="n40" xy="140,150" size="149,47" group="n41_mk2u" fontSize="34" color="#5c3c16" text="游戏音效:"/>
+    <text id="n40_mk2u" name="n40" xy="140,150" size="177,54" group="n41_mk2u" font="ui://27vd145bpxed7ik2" fontSize="40" color="#0d1725" text="游戏音效:"/>
-    <component id="n84_fgao" name="slider_music" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="307,217" size="347,45" group="n41_mk2u">
+    <component id="n84_fgao" name="slider_music" src="mk2u138" fileName="component/Main/setting/component/Slider1.xml" xy="329,225" size="347,45" group="n41_mk2u">
       <Slider value="50" max="100"/>
     </component>
-    <group id="n41_mk2u" name="n41" xy="140,146" size="514,116" group="n58_mk2u" advanced="true"/>
+    <group id="n41_mk2u" name="n41" xy="140,150" size="536,123" group="n58_mk2u" advanced="true"/>
     <image id="n44_mk2u" name="n44" src="mk2u13b" fileName="component/Main/setting/images/setting/zipai_font_01.png" xy="139,594" size="72,90" group="n50_mk2u"/>
     <image id="n45_mk2u" name="n45" src="mk2u13c" fileName="component/Main/setting/images/setting/zipai_font_02.png" xy="341,593" size="72,91" group="n50_mk2u"/>
     <image id="n46_mk2u" name="n46" src="mk2u13d" fileName="component/Main/setting/images/setting/zipai_font_03.png" xy="532,593" size="71,89" group="n50_mk2u"/>
@@ -66,7 +66,7 @@
     <group id="n54_mk2u" name="n54" xy="210,640" size="394,47" group="n58_mk2u" visible="false" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n83_fgao" name="n83" src="fgao1dr" fileName="component/setting/images/newsetting/sx_img.png" xy="309,99" size="180,34" group="n58_mk2u">
+    <image id="n83_fgao" name="n83" src="tlmy7ilj" fileName="conMui/Frame 260.png" pkg="27vd145b" xy="309,99" size="204,47" group="n58_mk2u">
       <relation target="" sidePair="center-center"/>
     </image>
     <image id="n85_fgao" name="n85" src="fgao1dv" fileName="component/setting/images/newsetting/bj_img.png" xy="309,289" size="180,33" group="n58_mk2u" visible="false">
@@ -79,9 +79,9 @@
       <relation target="" sidePair="center-center"/>
     </image>
     <group id="n58_mk2u" name="panel_set" xy="0,0" size="772,1101" advanced="true"/>
-    <image id="n79_fgao" name="n79" src="fgao1do" fileName="component/setting/images/newsetting/szbt_img.png" xy="246,8" size="315,74" group="n81_fgao"/>
+    <image id="n79_fgao" name="n79" src="tlmy7ili" fileName="conMui/设置.png" pkg="27vd145b" xy="323,8" group="n81_fgao"/>
-    <image id="n80_fgao" name="n80" src="fgao1dp" fileName="component/setting/images/newsetting/szz_img.png" xy="353,26" size="102,39" group="n81_fgao"/>
+    <image id="n80_fgao" name="n80" src="fgao1dp" fileName="component/setting/images/newsetting/szz_img.png" xy="414,26" size="102,39" group="n81_fgao" visible="false"/>
-    <group id="n81_fgao" name="n81" xy="246,8" size="315,74" advanced="true">
+    <group id="n81_fgao" name="n81" xy="323,8" size="192,87" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

fk101/wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 71574a229d707bb4b92d161e72155f69
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: da94c875c69da0b48b40bad8097aff65
+guid: 137c42eb55bed824d99c98fb9d170e0a
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_zipaimajiang/5e7576133a2faa8ebd62dcf50daf15d5
+  assetBundleName: 
   assetBundleVariant: 

fk101/wb_unity_pro/Assets/ART/base/main_zipaimajiang/bg/bg_5.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: da94c875c69da0b48b40bad8097aff65
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    wrapU: -1
+    wrapV: -1
+    wrapW: -1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: base/main_zipaimajiang/5e7576133a2faa8ebd62dcf50daf15d5
+  assetBundleVariant: