同步前提交

wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info

@@ -1,8 +1,5 @@
 {
   "objectStatus": {
-    "n185_yffn": {
-      "collapsed": true
-    },
     "n155_diqo": {
       "collapsed": true
     },

wb_new_ui/.objs/workspace.json

@@ -2,38 +2,25 @@
   "libview.firstColumnWidth": 280,
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://m7iejg4610snh5j",
+    "ui://v0j9abjygq7med",
-    "ui://m7iejg46imp57ih3",
+    "ui://v0j9abjygq7mcu"
-    "ui://m7iejg46ozazhxs",
-    "ui://m7iejg46gls1hif",
-    "ui://m7iejg46imp57ihy",
-    "ui://m7iejg46imp57igy",
-    "ui://m7iejg46xed47ion",
-    "ui://m7iejg46hsbhhjn",
-    "ui://m7iejg46t1hqhxw",
-    "ui://2d9xdj6zsvin7e2f",
-    "ui://m7iejg46imp57ih1",
-    "ui://m7iejg46ilon7ibl",
-    "ui://m7iejg46imp57iht"
   ],
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://m7iejg46t1hqhxw",
+  "doc.activeDoc": "ui://v0j9abjygq7mcu",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
     "/",
     "27vd145b",
     "/images/",
-    "m7iejg46",
+    "v0j9abjy",
     "/",
-    "m7iejg46",
+    "lx6k641g",
-    "/component/",
+    "/",
-    "m7iejg46",
+    "lx6k641g",
-    "/component/nav/",
+    "/image/"
-    "m7iejg46",
-    "/images/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Common/Gcm_Window.xml

@@ -2,12 +2,12 @@
 <component size="2532,1170">
   <controller name="hide_bg" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n0_lwcl" name="win_mode" xy="-10,0" size="2552,1170" type="rect" lineSize="0" fillColor="#80000000">
+    <graph id="n0_lwcl" name="win_mode" xy="0,0" size="2532,1170" type="rect" lineSize="0" fillColor="#80000000">
       <gearDisplay controller="hide_bg" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="599,335" pivot="0.5,0.5" size="1334,500">
+    <component id="n1_lwcl" name="contentPane" src="cjli6" fileName="UIPanel.xml" xy="0,0" pivot="0.5,0.5" size="2532,1170">
-      <relation target="" sidePair="middle-middle,center-center"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </component>
   </displayList>
   <transition name="in">

wb_new_ui/assets/Common/Gcm_Window_Full.xml

@@ -2,7 +2,7 @@
 <component size="2532,1170">
   <controller name="hide_bg" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n0_lwcl" name="win_mode" xy="-10,0" size="2552,1170" type="rect" lineSize="0" fillColor="#bf000000">
+    <graph id="n0_lwcl" name="win_mode" xy="0,0" size="2532,1170" type="rect" lineSize="0" fillColor="#bf000000">
       <gearLook controller="hide_bg" pages="1" values="0,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </graph>

wb_new_ui/assets/Common/PopPanel.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" opaque="false" initName="PopPanel">
+<component size="2532,1170" opaque="false" initName="PopPanel">
   <displayList>
     <graph id="n0_hznk" name="click_item" xy="1041,183" size="295,278" alpha="0" type="rect"/>
   </displayList>

wb_new_ui/assets/Common/UIPanel.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <component size="2532,1170" opaque="false">
   <displayList>
-    <component id="n1_hznk" name="PopPanel" src="hznkce2" fileName="PopPanel.xml" xy="0,0" size="2532,1170" visible="false"/>
+    <component id="n1_hznk" name="PopPanel" src="hznkce2" fileName="PopPanel.xml" xy="0,0" size="2532,1170" visible="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </component>
   </displayList>
   <transition name="left_pop">
     <item time="0" type="Visible" target="n1_hznk" value="true"/>

wb_new_ui/assets/Common/package.xml

@@ -1082,6 +1082,7 @@
     <image id="nuxq7ijc" name="zjph_txt_zsyph_01.png" path="/font/images/"/>
     <image id="nuxq7ijd" name="zjph_txt_zsyph_02.png" path="/font/images/"/>
     <image id="nuxq7ije" name="bxx_bg_01.png" path="/font/images/win/" exported="true"/>
+    <image id="nuxq7ijf" name="wf_bg_01.png" path="/font/images/win/" exported="true"/>
     <image id="nuxq7ijg" name="ann_xiayibu.png" path="/component/create_room/image/"/>
     <image id="nuxq7ijh" name="ann_zhuobuyanse.png" path="/component/create_room/image/"/>
     <font id="ilon7ia1" name="AlimamaFangYuanTiVF-Thin.ttf" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
@@ -1338,6 +1339,8 @@
     <image id="itp87iqq" name="icon_game_music.png" path="/images/" exported="true"/>
     <image id="itp87iqr" name="icon_game_sound.png" path="/images/" exported="true"/>
     <image id="itp87iqs" name="icon_setting_chooseBG.png" path="/images/" exported="true"/>
+    <image id="yffnrs" name="bg_poker_other.png" path="/images/" exported="true" scale="9grid" scale9grid="176,53,352,106"/>
+    <image id="yffnrt" name="bg_poker_self.png" path="/images/" exported="true" scale="9grid" scale9grid="176,53,352,106"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Clearing/Component/Comp_playerOver0Info.xml

@@ -2,8 +2,8 @@
 <component size="1985,209">
   <controller name="chuntian" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n13_yffn" name="n13" src="yffnrs" fileName="image/bg_poker_other.png" pkg="lx6k641g" xy="0,0" size="1985,209"/>
+    <image id="n13_yffn" name="n13" src="yffnrs" fileName="image/bg_poker_other.png" pkg="27vd145b" xy="0,0" size="1985,209"/>
-    <image id="n14_yffn" name="n14" src="yffnrt" fileName="image/bg_poker_self.png" pkg="lx6k641g" xy="0,0" size="1985,209"/>
+    <image id="n14_yffn" name="n14" src="yffnrt" fileName="image/bg_poker_self.png" pkg="27vd145b" xy="0,0" size="1985,209"/>
     <text id="n7_n9qr" name="name" xy="77,71" size="289,66" font="Microsoft YaHei" fontSize="46" color="#43633d" vAlign="middle" autoSize="none" text="用户名称">
       <relation target="" sidePair="center-center%"/>
     </text>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -2,7 +2,7 @@
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
   <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
-  <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="2"/>
+  <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="1"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
   <controller name="card_eff" pages="0,,1," selected="0"/>
   <controller name="zidongtishi" pages="0,,1," selected="0"/>
@@ -56,14 +56,12 @@
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n182_yffn" name="btn_ready" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="766,620" size="400,169" group="n185_yffn">
-      <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://27vd145byffn7ipc"/>
     </component>
     <component id="n184_yffn" name="btn_xipai" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1366,620" size="400,169" group="n185_yffn">
-      <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://27vd145byffn7ipd"/>
     </component>
-    <component id="n186_yffn" name="btn_readyonly" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1066,629" size="400,169" group="n185_yffn">
+    <component id="n186_yffn" name="btn_readyonly" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1066,629" size="400,169" group="n185_yffn" visible="false">
       <gearDisplay controller="action" pages="0"/>
       <Button icon="ui://27vd145byffn7ipc"/>
     </component>
@@ -75,13 +73,13 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </text>
-    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="Gcm_chat.xml" xy="2368,533" visible="false" pkg="27vd145b"/>
+    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="component/Gcm_chat.xml" pkg="27vd145b" xy="2368,533" visible="false"/>
     <component id="n79_roef" name="btn_distance" src="yffnj3" fileName="component/gps/btn_distance_new.xml" xy="1729,1848" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n86_q50p" sidePair="right-right"/>
     </component>
-    <component id="n181_yffn" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" xy="0,0" group="n86_q50p" pkg="27vd145b"/>
+    <component id="n181_yffn" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" pkg="27vd145b" xy="0,0" group="n86_q50p"/>
-    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="1059,10" group="n86_q50p" touchable="false" pkg="27vd145b"/>
+    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="1059,10" group="n86_q50p" touchable="false"/>
     <component id="n84_q50p" name="btn_back_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="626,15" size="64,106" group="n86_q50p">
       <gearDisplay controller="state" pages="0,3"/>
       <Button icon="ui://27vd145byffn7ip2"/>
@@ -89,7 +87,7 @@
     <component id="n85_q50p" name="btn_rule" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="415,15" size="129,106" group="n86_q50p">
       <Button icon="ui://27vd145byffn7ip5"/>
     </component>
-    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" xy="784,131" size="995,0" group="n86_q50p" scale="1.5,1.5" visible="false" touchable="false" pkg="27vd145b"/>
+    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="784,131" size="995,0" group="n86_q50p" scale="1.5,1.5" visible="false" touchable="false"/>
     <component id="n120_r1z9" name="btn_leave_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="784,15" size="71,106" group="n86_q50p">
       <gearDisplay controller="state" pages="0,3"/>
       <Button icon="ui://27vd145byffn7ip3"/>

wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjygq7m95">
-  <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="3d" pages="0,,1," selected="0"/>
   <displayList>
     <text id="n93_nkur" name="wanfa_text" xy="869,485" pivot="0.5,0" size="772,56" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="玩法介绍">
@@ -95,20 +95,19 @@
     <component id="n7" name="player_info1" src="gq7m8u" fileName="Main_style_2/PlayerHead_1_s2(1).xml" xy="39,496" size="100,172" scale="1.5,1.5">
       <relation target="" sidePair="left-left,bottom-bottom,left-left,bottom-bottom"/>
     </component>
-    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="880,968" group="n36_k3io" visible="false">
+    <component id="n112_itp8" name="btn_ready" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="766,620" size="400,169" group="n115_itp8">
-      <Button icon="ui://v0j9abjygq7m49"/>
+      <Button icon="ui://27vd145byffn7ipc"/>
     </component>
-    <component id="n110_a81d" name="btn_xipai" src="a81dsp" fileName="buttons/btn_xipai.xml" xy="1410,872" size="240,90" group="n36_k3io">
+    <component id="n113_itp8" name="btn_xipai" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1366,620" size="400,169" group="n115_itp8">
-      <gearDisplay controller="action" pages="0,1"/>
+      <Button icon="ui://27vd145byffn7ipd"/>
-      <relation target="" sidePair="topext-bottom,bottomext-bottom"/>
     </component>
-    <component id="n111_nlef" name="btn_ready" src="kzpehy5" fileName="component/game/btn_ready.xml" pkg="27vd145b" xy="927,872" group="n36_k3io">
+    <component id="n114_itp8" name="btn_readyonly" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1066,629" size="400,169" group="n115_itp8" visible="false">
-      <gearDisplay controller="action" pages="0,1"/>
+      <gearDisplay controller="action" pages="0"/>
-      <relation target="" sidePair="topext-bottom,bottomext-bottom"/>
+      <Button icon="ui://27vd145byffn7ipc"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="880,872" size="770,181" advanced="true">
+    <group id="n115_itp8" name="btn_rendy" xy="766,620" size="1000,178" advanced="true">
       <gearDisplay controller="state" pages="0"/>
-      <relation target="" sidePair="center-center,topext-bottom,bottomext-bottom"/>
+      <relation target="" sidePair="center-center"/>
     </group>
     <component id="n57_rayb" name="panel_record" src="gq7m4t" fileName="Main_style_2/record/Record.xml" xy="828,434" size="757,165" group="n59_v38k" alpha="0.5">
       <gearDisplay controller="state" pages="3"/>

wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" bgColorEnabled="true">
+<component size="2532,1170">
   <controller name="over" pages="0,,1," selected="0"/>
   <controller name="button" pages="0,,1," selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
@@ -9,130 +9,123 @@
   <controller name="matypeshow" pages="0,,1," selected="0"/>
   <controller name="matypebgshow" pages="0,,1," selected="0"/>
   <controller name="paixing" pages="0,,1," selected="0"/>
-  <controller name="xipai" pages="0,,1," selected="1"/>
+  <controller name="xipai" pages="0,,1," selected="0"/>
   <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="n110_itp8" name="n110" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="177,24" size="2178,1120"/>
-    <image id="n31_piv9" name="bg" src="gq7mcg" fileName="component/clearing/clearing1/lk.png" xy="-78,0" size="1497,750" visible="false">
+    <list id="n3_fux2" name="player_list_1" xy="322,359" size="1334,517" group="n29_10imx" lineGap="10" defaultItem="ui://v0j9abjygq7mcu" autoItemSize="false" align="center" vAlign="middle">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <loader id="n33_piv9" name="ldr_title" xy="588,1" size="159,42" url="ui://v0j9abjygq7me9" align="center" vAlign="middle" fill="scaleFree" useResize="true" autoSize="true">
-      <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"/>
-    </loader>
-    <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"/>
       <item/>
       <item/>
     </list>
-    <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="n34_piv9" name="tex_gameinfo" xy="204,43" size="676,72" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" vAlign="middle" autoSize="shrink" text="大夫看见撒地方就阿斯蒂芬啊收到了附件啊收到了附件阿斯蒂芬就撒地方空间撒地方空间撒地方就士大夫看见撒地方就阿斯蒂芬"/>
-    <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;"/>
+    <text id="n35_piv9" name="tex_roominfo" xy="1619,34" size="590,87" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="房号123456 局10/16 2019-10-7 09:24:10&#xA;"/>
-    <group id="n36_piv9" name="room_info" xy="2,3" size="1331,70" group="n29_10imx" advanced="true">
+    <group id="n36_piv9" name="room_info" xy="204,34" size="2005,87" group="n29_10imx" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <text id="n22_xtwh" name="n22" xy="23,712" size="400,26" group="n29_10imx" visible="false" fontSize="18" color="#624720" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
+    <text id="n22_xtwh" name="n22" xy="344,957" size="400,27" 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="543,671" size="247,67" group="n29_10imx">
+    <component id="n12_nrno" name="btn_showResult" src="gq7me7" fileName="component/clearing/room/btn_invite.xml" xy="864,916" size="247,67" group="n29_10imx">
       <gearDisplay controller="button" pages="1"/>
       <Button icon="ui://v0j9abjygq7mcj"/>
     </component>
-    <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">
+    <component id="n4_fux2" name="btn_confirm" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1744,894" size="230,80" group="n28_xhvg">
       <gearDisplay controller="button" pages="0"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mci"/>
     </component>
-    <component id="n62_ona1" name="btn_detal" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="465,641" group="n28_xhvg">
+    <component id="n62_ona1" name="btn_detal" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1385,886" group="n28_xhvg">
       <gearDisplay controller="button" pages="0"/>
-      <gearXY controller="paixing" pages="0,1" values="465,641|1038,653"/>
+      <gearXY controller="paixing" pages="0,1" values="1385,886|1637,653"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mda"/>
     </component>
-    <component id="n104_ux6x" name="btn_fanhuipaixing" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="465,641" group="n28_xhvg">
+    <component id="n104_ux6x" name="btn_fanhuipaixing" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1385,886" group="n28_xhvg">
       <gearDisplay controller="button" pages="0"/>
-      <gearXY controller="paixing" pages="0,1" values="465,641|1038,653"/>
+      <gearXY controller="paixing" pages="0,1" values="1385,886|1637,653"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mdh"/>
     </component>
-    <component id="n109_nlef" name="btn_xipai" src="a81dsp" fileName="buttons/btn_xipai.xml" xy="1106,649" size="230,80" group="n28_xhvg">
+    <component id="n109_nlef" name="btn_xipai" src="a81dsp" fileName="buttons/btn_xipai.xml" xy="2026,894" size="230,80" group="n28_xhvg">
       <gearDisplay controller="xipai" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </component>
-    <group id="n28_xhvg" name="n28" xy="465,641" size="870,105" group="n24_gfyh" advanced="true">
+    <group id="n28_xhvg" name="n28" xy="1385,886" size="871,105" group="n24_gfyh" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
-    <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">
+    <component id="n63_uwvl" name="btn_maima" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1401,884" size="320,105" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mdc"/>
     </component>
-    <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">
+    <component id="n64_uwvl" name="btn_jiangma" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1118,886" size="320,105" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mdb"/>
     </component>
-    <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">
+    <component id="n103_e0b9" name="btn_fama" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1401,884" size="320,105" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mdg"/>
     </component>
-    <group id="n65_uwvl" name="n65" xy="198,639" size="603,107" group="n24_gfyh" advanced="true">
+    <group id="n65_uwvl" name="n65" xy="1118,884" size="603,107" group="n24_gfyh" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
-    <group id="n24_gfyh" name="btns" xy="198,639" size="1137,107" group="n29_10imx" advanced="true">
+    <group id="n24_gfyh" name="btns" xy="1118,884" size="1138,107" group="n29_10imx" advanced="true">
-      <gearXY controller="over" pages="0,1" values="198,639|199,638"/>
+      <gearXY controller="over" pages="0,1" values="1118,884|199,638"/>
     </group>
-    <group id="n29_10imx" name="n29" xy="1,3" size="1334,743" advanced="true">
+    <group id="n29_10imx" name="n29" xy="204,34" size="2052,957" advanced="true">
       <gearDisplay controller="over" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n30_10imx" name="big_result" src="gq7mdj" fileName="component/clearing/clearing2/result_main.xml" xy="0,0">
       <gearDisplay controller="over" pages="1"/>
     </component>
-    <image id="n41_ona1" name="n41" src="m16msg" fileName="component/clearing/clearing1/Rectangle 405.png" xy="-3,654" size="530,98" group="n52_ona1"/>
+    <image id="n41_ona1" name="n41" src="m16msg" fileName="component/clearing/clearing1/Rectangle 405.png" xy="596,654" size="530,98" group="n52_ona1"/>
-    <text id="n106_ttbr" name="n106" xy="11,672" size="78,66" group="n52_ona1" fontSize="36" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="鸟牌"/>
+    <text id="n106_ttbr" name="n106" xy="610,672" size="78,66" group="n52_ona1" fontSize="36" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="鸟牌"/>
-    <image id="n40_ona1" name="n40" src="gq7mef" fileName="n40.png" xy="5,669" size="85,67" group="n52_ona1" visible="false"/>
+    <image id="n40_ona1" name="n40" src="gq7mef" fileName="n40.png" xy="604,669" size="85,67" group="n52_ona1" visible="false"/>
-    <component id="n54_ona1" name="niao1" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="97,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n54_ona1" name="niao1" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="696,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n55_ona1" name="niao2" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="139,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n55_ona1" name="niao2" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="738,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n56_ona1" name="niao3" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="181,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n56_ona1" name="niao3" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="780,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n57_ona1" name="niao4" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="223,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n57_ona1" name="niao4" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="822,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n58_ona1" name="niao5" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="265,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n58_ona1" name="niao5" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="864,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n59_ona1" name="niao6" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="307,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n59_ona1" name="niao6" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="906,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n60_ona1" name="niao7" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="349,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n60_ona1" name="niao7" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="948,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n61_ona1" name="niao8" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="391,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n61_ona1" name="niao8" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="990,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n107_o8w8" name="niao9" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="433,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n107_o8w8" name="niao9" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1032,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <component id="n108_o8w8" name="niao10" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="475,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
+    <component id="n108_o8w8" name="niao10" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1074,671" size="52,103" group="n52_ona1" scale="0.8,0.8" controller="color,0"/>
-    <group id="n52_ona1" name="n5200" xy="-3,654" size="530,120" advanced="true">
+    <group id="n52_ona1" name="n5200" xy="596,654" size="530,120" advanced="true">
       <gearDisplay controller="mapai" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n80_uwvl" name="n80" src="gq7mdd" fileName="component/clearing/clearing1/bg_serviceStop_panel.png" xy="228,55" size="892,605" group="n79_uwvl"/>
+    <image id="n80_uwvl" name="n80" src="gq7mdd" fileName="component/clearing/clearing1/bg_serviceStop_panel.png" xy="827,55" size="892,605" group="n79_uwvl"/>
-    <image id="n82_uwvl" name="n82" src="gq7mde" fileName="component/clearing/clearing1/bg_ty.png" xy="253,168" size="838,399" group="n79_uwvl"/>
+    <image id="n82_uwvl" name="n82" src="gq7mde" fileName="component/clearing/clearing1/bg_ty.png" xy="852,168" size="838,399" group="n79_uwvl"/>
-    <image id="n81_uwvl" name="n81" src="gq7md7" fileName="component/clearing/clearing1/mapai.png" xy="599,77" size="85,31" group="n79_uwvl"/>
+    <image id="n81_uwvl" name="n81" src="gq7md7" fileName="component/clearing/clearing1/mapai.png" xy="1198,77" size="85,31" group="n79_uwvl"/>
-    <text id="n68_uwvl" name="tex_roominfo1" xy="265,152" size="101,69" group="n69_uwvl" fontSize="40" color="#ff99ff" align="center" vAlign="middle" autoSize="shrink" text="奖马"/>
+    <text id="n68_uwvl" name="tex_roominfo1" xy="864,152" size="101,69" group="n69_uwvl" fontSize="40" color="#ff99ff" align="center" vAlign="middle" autoSize="shrink" text="奖马"/>
-    <component id="n83_uwvl" name="maima1" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="413,233" size="52,67" group="n69_uwvl"/>
+    <component id="n83_uwvl" name="maima1" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1012,233" size="52,67" group="n69_uwvl"/>
-    <component id="n84_uwvl" name="maima2" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="580,233" size="52,67" group="n69_uwvl"/>
+    <component id="n84_uwvl" name="maima2" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1179,233" size="52,67" group="n69_uwvl"/>
-    <component id="n85_uwvl" name="maima3" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="730,233" size="52,67" group="n69_uwvl"/>
+    <component id="n85_uwvl" name="maima3" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1329,233" size="52,67" group="n69_uwvl"/>
-    <component id="n86_uwvl" name="maima4" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="899,233" size="52,67" group="n69_uwvl"/>
+    <component id="n86_uwvl" name="maima4" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1498,233" size="52,67" group="n69_uwvl"/>
-    <component id="n87_uwvl" name="maima5" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="415,378" size="52,67" group="n69_uwvl"/>
+    <component id="n87_uwvl" name="maima5" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1014,378" size="52,67" group="n69_uwvl"/>
-    <component id="n88_uwvl" name="maima6" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="582,378" size="52,67" group="n69_uwvl"/>
+    <component id="n88_uwvl" name="maima6" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1181,378" size="52,67" group="n69_uwvl"/>
-    <component id="n89_uwvl" name="maima7" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="732,378" size="52,67" group="n69_uwvl"/>
+    <component id="n89_uwvl" name="maima7" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1331,378" size="52,67" group="n69_uwvl"/>
-    <component id="n90_uwvl" name="maima8" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="901,378" size="52,67" group="n69_uwvl"/>
+    <component id="n90_uwvl" name="maima8" src="gq7mct" fileName="component/clearing/clearing1/clearing_card.xml" xy="1500,378" size="52,67" group="n69_uwvl"/>
-    <group id="n69_uwvl" name="room_info1" xy="265,152" size="688,293" group="n79_uwvl" advanced="true">
+    <group id="n69_uwvl" name="room_info1" xy="864,152" size="688,293" group="n79_uwvl" advanced="true">
       <gearDisplay controller="matypeshow" pages="0"/>
       <relation target="" sidePair=""/>
     </group>
-    <component id="n102_uwvl" name="btn_queding" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="472,561" group="n79_uwvl">
+    <component id="n102_uwvl" name="btn_queding" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1071,561" group="n79_uwvl">
       <Button icon="ui://v0j9abjygq7md5"/>
     </component>
-    <list id="n101_uwvl" name="jiangmalist" xy="253,163" size="835,379" group="n100_uwvl" overflow="scroll" defaultItem="ui://v0j9abjygq7mdf" vAlign="middle">
+    <list id="n101_uwvl" name="jiangmalist" xy="852,163" size="835,379" group="n100_uwvl" overflow="scroll" defaultItem="ui://v0j9abjygq7mdf" vAlign="middle">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <group id="n100_uwvl" name="room_info2" xy="253,163" size="835,379" group="n79_uwvl" advanced="true">
+    <group id="n100_uwvl" name="room_info2" xy="852,163" size="835,379" group="n79_uwvl" advanced="true">
       <gearDisplay controller="matypeshow" pages="1"/>
       <relation target="" sidePair=""/>
     </group>
-    <group id="n79_uwvl" name="n79" xy="228,55" size="892,611" advanced="true">
+    <group id="n79_uwvl" name="n79" xy="827,55" size="892,611" advanced="true">
       <gearDisplay controller="matypebgshow" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>