布局修改

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -48,6 +48,7 @@ function GroupMgrController.new()
     self._eventmap[Protocol.FGMGR_EVT_UPDATE_GROUP] = self.OnEvtUpdateGroup
     self._eventmap[Protocol.FGMGR_EVT_NEW_MAIL] = self.OnEvtNewMailTip
     self._eventmap[Protocol.FGMGR_RESPONSE_INVITE] = self.FG_ResponseInvited
+    self._eventmap[Protocol.WEB_FG_ISOPEN_CHATROOM] = self.FG_Isopen_ChatRoom
     -- self:connect(callback)
     return self
 end
@@ -342,6 +343,11 @@ function M:FG_ResponseInvited(evt_data)
     DispatchEvent(self._dispatcher, GroupMgrEvent.InviteResponse, invite_id, g_name, roomid, pid, groupid)
 end
 
+function M:FG_Isopen_ChatRoom(evt_data)
+    print("收到是否开启聊天室推送")
+    pt(evt_data)
+end
+
 function M:PopEvent()
     local _cacheEvent = self._cacheEvent
     if (_cacheEvent:Count() > 0) then

lua_probject/base_project/Game/Protocol.lua

@@ -385,6 +385,9 @@ Protocol = {
     WEB_FG_OPEN_ISOPEN_CHATROOM     = "13001",
     -- 设置不允许成员查看聊天室
     WEB_FG_CLOSE_ISOPEN_CHATROOM    = "13002",
+
+    -- 监听聊天室是否开启
+    WEB_FG_ISOPEN_CHATROOM          = "12011",
     -- 设置是否允许观战
     WEB_FG_SET_CANWATCH             = "set_group_guest",
 

wb_new_ui/assets/Main_Majiang/Main_new/Chat/Component/Btn_MessageTalk.xml

@@ -2,7 +2,9 @@
 <component size="120,120" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_ckvb" name="n3" src="pbp614j" fileName="Main_New/Image/Group 205.png" xy="-3,-3"/>
+    <image id="n3_ckvb" name="n3" src="u63319t" fileName="Main_new/Chat/Image/button_voice.png" xy="0,0" size="120,120">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Comp_ConterBox.xml

@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="258,258">
+<component size="350,274">
-  <controller name="seat" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="seat" pages="0,,1,,2,,3," selected="1"/>
   <displayList>
-    <image id="n3_gjnb" name="n3" src="gjnb10c" fileName="Main_new/Main/Image/Group 243.png" xy="43,40"/>
+    <image id="n3_gjnb" name="n3" src="gjnb10c" fileName="Main_new/Main/Image/Group 243.png" xy="58,42" size="231,187">
-    <image id="n4_gjnb" name="n4" src="gjnb109" fileName="Main_new/Main/Image/Group 240.png" xy="166,0">
+      <relation target="" sidePair="width-width%,height-height%,center-center,middle-middle"/>
+    </image>
+    <image id="n4_gjnb" name="n4" src="gjnb109" fileName="Main_new/Main/Image/Group 240.png" xy="225,0" size="124,274">
       <gearDisplay controller="seat" pages="1"/>
+      <relation target="" sidePair="width-width%,height-height%,right-right"/>
     </image>
-    <image id="n5_gjnb" name="n5" src="gjnb10a" fileName="Main_new/Main/Image/Group 241.png" xy="0,0">
+    <image id="n5_gjnb" name="n5" src="gjnb10a" fileName="Main_new/Main/Image/Group 241.png" xy="0,0" size="350,97">
       <gearDisplay controller="seat" pages="2"/>
+      <relation target="" sidePair="width-width%,height-height%,top-top"/>
     </image>
-    <image id="n6_gjnb" name="n6" src="gjnb10b" fileName="Main_new/Main/Image/Group 242.png" xy="0,0">
+    <image id="n6_gjnb" name="n6" src="gjnb10b" fileName="Main_new/Main/Image/Group 242.png" xy="0,0" size="124,274">
       <gearDisplay controller="seat" pages="3"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left"/>
     </image>
-    <image id="n7_gjnb" name="n7" src="gjnb108" fileName="Main_new/Main/Image/Group 244.png" xy="0,166">
+    <image id="n7_gjnb" name="n7" src="gjnb108" fileName="Main_new/Main/Image/Group 244.png" xy="0,176" size="350,97">
       <gearDisplay controller="seat" pages="0"/>
+      <relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
     </image>
-    <text id="n8_gjnb" name="Text_Time" xy="94,101" size="69,56" font="ui://27vd145bh35o7ik0" fontSize="42" color="#ff9500" bold="true" text="120">
+    <text id="n8_gjnb" name="Text_Time" xy="140,109" size="69,56" font="ui://27vd145bh35o7ik0" fontSize="42" color="#ff9500" bold="true" text="120">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_closeRoom.xml

@@ -2,7 +2,9 @@
 <component size="360,129" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_pkx5" name="n3" src="pkx5st" fileName="Main_new_2/Image/Group 195.png" xy="-6,-9"/>
+    <image id="n3_pkx5" name="n3" src="u63319y" fileName="Main_new/Main/Image/dismiss_room.png" xy="0,0" size="360,129">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_head.xml

@@ -5,10 +5,10 @@
     <graph id="n2_pkx5" name="mask" xy="0,0" size="132,132" touchable="false" type="rect" lineSize="0" fillColor="#ffcccccc">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <loader id="n3_pkx5" name="icon" xy="1,1" size="130,130" fill="scale">
+    <loader id="n3_pkx5" name="icon" xy="1,1" size="130,130" url="ui://27vd145bnlvy7iaa" align="center" vAlign="middle" fill="scaleFree" clearOnPublish="true">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <graph id="n1_pkx5" name="border" xy="0,0" size="132,132" touchable="false" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#00fafafa" corner="12">
+    <graph id="n1_pkx5" name="border" xy="0,0" size="132,132" visible="false" touchable="false" type="rect" lineSize="2" lineColor="#ff804b2e" fillColor="#00fafafa" corner="12">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_invite.xml

@@ -2,7 +2,9 @@
 <component size="360,129" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_pkx5" name="n3" src="t6zvw6" fileName="Main_new_2/StartAndReady/Image/Group 196.png" xy="-6,-9"/>
+    <image id="n3_pkx5" name="n3" src="u63319z" fileName="Main_new/Main/Image/inivite_friend.png" xy="0,0" size="360,129">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml

@@ -2,7 +2,7 @@
 <component size="100,100" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <loader id="n4_gmbn" name="icon" xy="0,0" size="100,100" fill="scale">
+    <loader id="n4_gmbn" name="icon" xy="0,0" size="100,100" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_ready.xml

@@ -2,7 +2,9 @@
 <component size="360,129" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_pkx5" name="n3" src="pkx5ss" fileName="Main_new_2/Image/Group 76.png" xy="-6,-9"/>
+    <image id="n3_pkx5" name="n3" src="u6331a0" fileName="Main_new/Main/Image/Paizhuo_ziz_btn_zb_normal.png" xy="0,0" size="360,129">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_setting.xml

@@ -2,7 +2,9 @@
 <component size="120,120" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n4_t6zv" name="n4" src="lu84ty" fileName="Main_new_2/StartAndReady/Image/Group 207.png" xy="-3,-3"/>
+    <image id="n4_t6zv" name="n4" src="u63319v" fileName="Main_new/Main/Image/button_setting.png" xy="0,0" size="120,120">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml

@@ -34,7 +34,9 @@
       <gearDisplay controller="bank" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,right-right,top-top"/>
     </image>
-    <group id="n33_e7qn" name="n33" xy="0,0" size="132,132"/>
+    <group id="n33_e7qn" name="n33" xy="0,0" size="132,132" advanced="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </group>
     <image id="n8" name="ready" src="gq7m5y" fileName="font/images/game/game_fonts_01.png" xy="-1,-109">
       <gearDisplay controller="read" pages="1"/>
       <relation target="" sidePair="top-bottom"/>
@@ -62,12 +64,11 @@
     <component id="n41_7q1m" name="n41" src="gq7m67" fileName="ting.xml" xy="-3,7">
       <gearDisplay controller="ting" pages="1"/>
     </component>
-    <text id="n44_rfcn" name="text_jifen" xy="53,126" size="25,49" group="n46_rfcn" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" autoClearText="true" text="0">
+    <text id="n50_u633" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" customData="{&quot;gradient&quot;:&quot;#ffff99,#ffcc33,#ffff99,#ffcc33&quot;}" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#ffff99" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="0">
-      <gearColor controller="text_color" pages="1" values="#ff0000,#000000" default="#ffffff,#000000"/>
+      <gearColor controller="text_color" pages="0,1" values="#ffff99,#000000|#ff0000,#000000"/>
-      <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
-    <group id="n46_rfcn" name="zhanji" xy="53,126" size="25,49" advanced="true">
+    <group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true">
-      <gearXY controller="site" pages="2,1" values="53,126|154,97" default="29,136"/>
+      <gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/>
     </group>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/ProgressBar_jiangxi.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="90,42" extention="ProgressBar">
   <displayList>
-    <image id="n6_lu84" name="n6" src="lu84tw" fileName="Main_new_2/Image/Group 192.png" xy="0,0"/>
+    <image id="n6_lu84" name="n6" src="u63319x" fileName="Main_new/Main/Image/item_dianchi.png" xy="0,0" size="90,42"/>
-    <graph id="n7_lu84" name="bar" xy="6,5" size="75,32" type="rect" lineSize="0" fillColor="#ff17bf23"/>
+    <graph id="n7_lu84" name="bar" xy="10,9" size="64,21" type="rect" lineSize="0" fillColor="#ff17bf23"/>
   </displayList>
   <ProgressBar/>
   <customProperty target="" propertyId="1"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml

@@ -11,8 +11,8 @@
   <controller name="text_color" pages="0,,1," selected="0"/>
   <controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
   <displayList>
-    <text id="n47_nkur" name="tuoguanTips" xy="1,125" size="302,48" fontSize="22" color="#ff0000" vAlign="middle" autoSize="none" text="开启托管剩余时间">
+    <text id="n47_nkur" name="tuoguanTips" xy="-85,-84" size="302,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
-      <gearXY controller="site" pages="2,1" values="1,125|154,50" default="-85,-104"/>
+      <gearXY controller="site" pages="2,1" values="-85,-84|154,50" default="-85,-104"/>
       <relation target="" sidePair="center-center,top-bottom"/>
     </text>
     <graph id="n32_kba2" name="offLine" xy="21,21" size="90,90" group="n33_e7qn" aspect="true" touchable="false" type="eclipse" lineSize="0" fillColor="#b3000000">
@@ -34,8 +34,8 @@
     <image id="n8" name="ready" src="gq7m5y" fileName="font/images/game/game_fonts_01.png" xy="158,32">
       <gearDisplay controller="read" pages="1"/>
     </image>
-    <text id="n48_pkx5" name="name" xy="136,18" size="203,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" autoSize="shrink" bold="true" singleLine="true" text="萌萌六个字了">
+    <text id="n48_pkx5" name="name" xy="-35,-46" size="203,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" autoSize="shrink" bold="true" singleLine="true" text="萌萌六个字了">
-      <gearXY controller="site" pages="2,0,1" values="136,18|-33,-57|154,0"/>
+      <gearXY controller="site" pages="2,0,1" values="-35,-46|-33,-57|154,0"/>
       <relation target="" sidePair="left-left,bottom-middle"/>
     </text>
     <component id="n31_e54q" name="chat" src="gq7m76" fileName="component/MsgBubble1.xml" xy="-153,32" size="216,67" alpha="0" touchable="false"/>
@@ -55,12 +55,12 @@
     <component id="n41_7q1m" name="n41" src="gq7m67" fileName="ting.xml" xy="-3,7">
       <gearDisplay controller="ting" pages="1"/>
     </component>
-    <text id="n44_rfcn" name="text_jifen" xy="136,64" size="29,58" group="n46_rfcn" font="ui://27vd145bh35o7ik0" fontSize="43" color="#ffffff" align="center" vAlign="middle" bold="true" autoClearText="true" text="0">
+    <text id="n44_rfcn" name="text_jifen" xy="-10,126" size="153,58" group="n46_rfcn" customData="{&quot;gradient&quot;:&quot;#ffff99,#ffcc33,#ffff99,#ffcc33&quot;}" font="ui://27vd145bg2mo7ij0" fontSize="43" color="#ffff99" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="0">
-      <gearColor controller="text_color" pages="1" values="#ff0000,#000000" default="#ffffff,#000000"/>
+      <gearColor controller="text_color" pages="0,1" values="#ffff99,#000000|#ff0000,#000000"/>
-      <relation target="" sidePair="left-left,top-middle"/>
     </text>
-    <group id="n46_rfcn" name="zhanji" xy="136,64" size="29,58" advanced="true">
+    <group id="n46_rfcn" name="zhanji" xy="-10,126" size="153,58" advanced="true">
-      <gearXY controller="site" pages="2,1" values="136,64|154,97" default="29,136"/>
+      <gearXY controller="site" pages="2,1" values="-10,126|154,97" default="29,136"/>
+      <relation target="" sidePair="center-center"/>
     </group>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Player_card_info_2_2.xml

@@ -3,7 +3,7 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="site" pages="0,2-1,1,2-2" selected="0"/>
-  <controller name="getCard" pages="0,,1," selected="0"/>
+  <controller name="getCard" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n27" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-152,-1357" size="2022,111">
       <gearXY controller="3d" pages="0,1" values="-152,-1357|517,-145"/>
@@ -44,7 +44,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n41_gi99" name="List_OutCard" xy="-204,173" pivot="0.5,0.5" size="2079,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
+    <list id="n41_gi99" name="List_OutCard" xy="-84,173" pivot="0.5,0.5" size="2079,502" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="4"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
-  <controller name="more" pages="0,,1," selected="1"/>
+  <controller name="more" pages="0,,1," selected="0"/>
   <controller name="witness" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
   <displayList>
@@ -30,19 +30,19 @@
       <relation target="n90_8sat" sidePair="right-right"/>
     </component>
     <component id="n86_8sat" name="roominfo_panel1" src="gq7m8g" fileName="Main_style_2/RoomInfoPanel1.xml" xy="118,-382" size="274,41" scale="2,2" touchable="false"/>
-    <component id="n34_k3io" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="3267,798" group="n36_k3io">
+    <component id="n34_k3io" name="btn_ready--" src="gq7m8w" fileName="Main_style_2/btn_ready.xml" xy="5711,798" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
-      <gearXY controller="action" pages="2,0,1" values="3267,798|-1716,120|2415,120"/>
+      <gearXY controller="action" pages="2,0,1" values="5711,798|-10043,798|5853,170"/>
       <Button icon="ui://v0j9abjygq7m48"/>
     </component>
-    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="2797,-240" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="352,488" group="n36_k3io" visible="false">
       <Button icon="ui://v0j9abjygq7m49"/>
     </component>
-    <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="3207,-233" group="n36_k3io" scale="0.9,1">
+    <component id="n104_mncc" name="btn_xipai--" src="gq7m8y" fileName="Main_style_2/Btn_Yellow.xml" xy="762,495" group="n36_k3io" scale="0.9,1">
       <gearDisplay controller="action" pages="1"/>
       <Button icon="ui://v0j9abjygq7m4i"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="2797,-240" size="736,1138" visible="false" advanced="true">
+    <group id="n36_k3io" name="n36" xy="352,488" size="5625,410" visible="false" advanced="true">
       <relation target="" sidePair="bottom-bottom,center-center"/>
     </group>
     <component id="n69_l2u4" name="gcm_chat" src="gq7m8z" fileName="Main_style_2/Gcm_chat.xml" xy="1933,-505">
@@ -76,25 +76,25 @@
     <group id="n100_dnw9" name="n100" xy="-534,-673" size="1282,510" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1086,675" group="n125_pkx5">
+    <component id="n121_pkx5" name="btn_ready" src="pkx5sw" fileName="Main_new/Main/Component/btn_ready.xml" xy="1032,657" size="408,114" group="n125_pkx5">
       <gearDisplay controller="action" pages="0"/>
     </component>
-    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1317,507" group="n125_pkx5"/>
+    <component id="n122_pkx5" name="btn_invite" src="pkx5sx" fileName="Main_new/Main/Component/btn_invite.xml" xy="1281,522" size="408,114" group="n125_pkx5"/>
-    <component id="n124_pkx5" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="855,507" group="n125_pkx5"/>
+    <component id="n124_pkx5" name="btn_closeRoom" src="pkx5sv" fileName="Main_new/Main/Component/btn_closeRoom.xml" xy="777,522" size="408,114" group="n125_pkx5"/>
-    <group id="n125_pkx5" name="readyBtn" xy="855,507" size="822,297" advanced="true">
+    <group id="n125_pkx5" name="readyBtn" xy="777,522" size="912,249" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="550,33" size="64,90" visible="false" touchable="false"/>
-    <text id="n134_lu84" name="text_time" xy="162,44" size="96,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="22:20"/>
+    <text id="n134_lu84" name="text_time" xy="119,0" size="96,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="22:20"/>
-    <component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="48,48" group="n135_lu84">
+    <component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="5,4" group="n135_lu84">
       <ProgressBar value="50" max="100"/>
     </component>
-    <component id="n175_gmbn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="61,146" pivot="0.5,0.5" size="189,69" group="n135_lu84">
+    <component id="n175_gmbn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="3,105" pivot="0.5,0.5" size="219,63" group="n135_lu84">
       <Button checked="true" icon="ui://v0j9abjygmbn13u"/>
     </component>
-    <text id="n136_lu84" name="text_roomId" xy="43,97" size="228,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="房间：123456"/>
+    <text id="n136_lu84" name="text_roomId" xy="0,53" size="228,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="房间：123456"/>
-    <group id="n135_lu84" name="top_left" xy="43,44" size="228,171"/>
+    <group id="n135_lu84" name="top_left" xy="0,0" size="228,168"/>
     <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,25" size="58,75" scale="2,2">
       <gearDisplay controller="state" pages="3"/>
     </component>
@@ -102,79 +102,76 @@
       <gearDisplay controller="state" pages="3"/>
       <Button icon="ui://v0j9abjylj2n17t"/>
     </component>
-    <component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_2_2.xml" xy="515,33">
+    <component id="n155_gi99" name="player_card_info2" src="inqx13x" fileName="Main_new/Main_new_2/Player_card_info_2_2.xml" xy="385,33">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
     <component id="n118_pkx5" name="player_card_info1" src="inqx13w" fileName="Main_new/Main_new_2/Player_card_info_2_1.xml" xy="9,975">
       <gearDisplay controller="state" pages="1,3,4"/>
-      <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <text id="n176_eqmd" name="remaining_card" xy="897,469" size="215,74" group="n179_eqmd" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="余999张">
+    <text id="n176_eqmd" name="remaining_card" xy="759,489" size="358,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="56" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="余999张">
       <gearDisplay controller="state" pages="1,3"/>
-      <relation target="n159_ckvb" sidePair="right-left"/>
     </text>
-    <text id="n177_eqmd" name="wanfa_text" xy="418,599" pivot="0.5,0" size="1696,56" group="n179_eqmd" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
+    <text id="n177_eqmd" name="wanfa_text" xy="418,605" pivot="0.5,0" size="1696,56" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
       <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <text id="n178_eqmd" name="text_round" xy="1418,469" size="241,74" group="n179_eqmd" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="局数:1\81">
+    <text id="n178_eqmd" name="text_round" xy="1411,489" size="364,74" group="n179_eqmd" font="ui://27vd145bg2mo7ij0" fontSize="56" color="#ffffff" vAlign="middle" autoSize="none" text="局数:1\81">
       <gearDisplay controller="state" pages="1,3,4"/>
-      <relation target="n159_ckvb" sidePair="left-right"/>
     </text>
-    <group id="n179_eqmd" name="center_text" xy="418,469" size="1696,186" advanced="true">
+    <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
-      <relation target="" sidePair="center-center,right-right"/>
+      <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,897" size="144,144">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
       <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="1" values="71,784" default="1188,897"/>
+      <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
-      <gearSize controller="state" default="144,144,1,1"/>
+      <gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="71,774" size="144,144">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,796" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
-      <gearXY controller="state" pages="1,3,4" values="73,784|73,784|71,774" default="739,916"/>
+      <gearXY controller="state" pages="1,3,4" values="100,796|73,784|71,774" default="739,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,909" size="144,144">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1844,63" size="153,120">
       <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
+      <gearXY controller="state" pages="0,1,2" values="1189,274|1844,63|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1897,43" size="108,108">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1834,63" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
-      <gearXY controller="state" pages="0,1,3,4" values="2031,519|1885,27|1885,27|1897,43" default="1337,909"/>
+      <gearXY controller="state" pages="0,1,3,4" values="1901,519|1834,63|1755,27|1767,43" default="1207,909"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
     </component>
     <text id="n162_qz7i" name="text_testName" xy="47,178" size="266,49" visible="false" fontSize="36" color="#ffffff" bold="true" text="|一个玩家的名字"/>
-    <component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1136,375" group="n169_gmbn">
+    <component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1091,373" group="n169_gmbn">
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
-    <group id="n169_gmbn" name="conter_box" xy="1136,375" size="258,258"/>
+    <group id="n169_gmbn" name="conter_box" xy="1091,373" size="350,274"/>
-    <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,36" group="n138_lu84">
+    <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2172,12" size="141,117" group="n138_lu84">
       <gearDisplay controller="state" pages="0,1,2,3,4"/>
     </component>
-    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,60" pivot="0.5,0.5" size="72,72" group="n138_lu84" rotation="180">
+    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,18" pivot="0.5,0.5" size="108,96" group="n138_lu84">
       <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
-      <Button checked="true" icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
+      <Button icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
     </component>
-    <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,33" pivot="0.5,0.5" size="102,119" group="n138_lu84">
+    <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,47" pivot="0.5,0.5" size="102,91" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
-      <Button checked="true" icon="ui://v0j9abjygmbn13p"/>
+      <Button checked="true" icon="ui://v0j9abjyu6331a4"/>
     </component>
     <component id="n172_gmbn" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,198" pivot="0.5,0.5" size="150,78" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
-      <Button icon="ui://v0j9abjygmbn13o"/>
+      <Button icon="ui://v0j9abjyu6331a1"/>
     </component>
-    <component id="n173_gmbn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,309" pivot="0.5,0.5" size="126,126" group="n138_lu84">
+    <component id="n173_gmbn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,319" pivot="0.5,0.5" size="126,106" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
-      <Button icon="ui://v0j9abjygmbn13q"/>
+      <Button icon="ui://v0j9abjyu6331a2"/>
     </component>
-    <component id="n174_gmbn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,360" pivot="0.5,0.5" size="126,126" group="n138_lu84">
+    <component id="n174_gmbn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,367" pivot="0.5,0.5" size="126,112" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
-      <Button icon="ui://v0j9abjygmbn13r"/>
+      <Button icon="ui://v0j9abjyu6331a3"/>
     </component>
-    <group id="n138_lu84" name="top_right" xy="2031,33" size="468,453"/>
+    <group id="n138_lu84" name="top_right" xy="2031,12" size="489,467"/>
-    <graph id="n146_l15a" name="btn_showNext" xy="1121,424" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
+    <graph id="n146_l15a" name="btn_showNext" xy="1121,423" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
       <gearDisplay controller="state" pages="1"/>
     </graph>
     <graph id="n163_qz7i" name="n163" xy="-125,-102" size="2832,1436" group="n168_qz7i" type="rect" lineSize="0" fillColor="#80000000"/>
@@ -230,9 +227,9 @@
     <text id="n181_kw9h" name="n181" xy="1114,1035" size="304,79" fontSize="60" color="#ffffff" text="正在旁观中">
       <gearDisplay controller="state" pages="4"/>
     </text>
-    <component id="n183_kzuz" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2409,213" size="123,252">
+    <component id="n183_kzuz" name="btn_inviteFamily" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2415,264" size="117,249">
       <gearDisplay controller="state" pages="0"/>
-      <Button icon="ui://v0j9abjykzuz14a"/>
+      <Button icon="ui://v0j9abjyu63319u"/>
     </component>
     <component id="n186_sx7x" name="n186" src="sx7x14f" fileName="Main_new/Main/Component/btn_bg.xml" xy="0,0" size="2532,1170">
       <gearDisplay controller="witness" pages="1"/>
@@ -241,11 +238,11 @@
     </component>
     <component id="n185_kzuz" name="comp_witness" src="kzuz14b" fileName="Main_new/Main/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
-      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
-    <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2328,482"/>
+    <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,519" size="144,123"/>
     <graph id="n188_pbp6" name="n188" xy="0,0" size="2532,1170" group="n191_pbp6" type="rect" lineSize="0" fillColor="#73000000"/>
-    <image id="n189_pbp6" name="n189" src="pbp614k" fileName="Main_new/Chat/Image/Group 205(1).png" xy="1203,522" group="n191_pbp6"/>
+    <image id="n189_pbp6" name="n189" pkg="v0j9abjy" src="pbp614k" fileName="Group 205(1).png" xy="1203,522" group="n191_pbp6"/>
     <text id="n190_pbp6" name="n190" xy="1024,667" size="484,79" group="n191_pbp6" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
     <group id="n191_pbp6" name="chatTalk" xy="0,0" size="2532,1170" advanced="true">
       <gearDisplay controller="voice" pages="1"/>

wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_invite.xml

@@ -2,7 +2,7 @@
 <component size="360,129" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_pkx5" name="n3" src="pkx5su" fileName="Main_new_2/Image/Group 196.png" xy="-6,-9"/>
+    <image id="n3_pkx5" name="n3" src="u63319z" fileName="Main_new/Main/Image/inivite_friend.png" xy="0,0" size="360,129"/>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new_2/Component/btn_ready.xml

@@ -2,7 +2,9 @@
 <component size="360,129" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n3_pkx5" name="n3" src="pkx5ss" fileName="Main_new_2/Image/Group 76.png" xy="-6,-9"/>
+    <image id="n3_pkx5" name="n3" src="pkx5ss" fileName="Main_new/Main/Image/Group 76.png" xy="-6,-9">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue=".8"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -961,7 +961,6 @@
     <component id="pkx5so" name="PlayerHead_1.xml" path="/Main_new/Main/"/>
     <component id="pkx5sr" name="Player_card_info_1.xml" path="/Main_new/Main/" exported="true"/>
     <image id="pkx5ss" name="Group 76.png" path="/Main_new/Main/Image/"/>
-    <image id="pkx5st" name="Group 195.png" path="/Main_new/Main/Image/"/>
     <component id="pkx5sv" name="btn_closeRoom.xml" path="/Main_new/Main/Component/"/>
     <component id="pkx5sw" name="btn_ready.xml" path="/Main_new/Main/Component/"/>
     <component id="pkx5sx" name="btn_invite.xml" path="/Main_new/Main/Component/"/>
@@ -982,8 +981,6 @@
     <component id="pn9mtf" name="OutCard_left_jiangxi.xml" path="/Main_new/Main/" exported="true"/>
     <component id="pn9mti" name="Back_left_jiangxi.xml" path="/Main_new/Main/" exported="true"/>
     <component id="lu84tv" name="ProgressBar_jiangxi.xml" path="/Main_new/Main/"/>
-    <image id="lu84tw" name="Group 192.png" path="/Main_new/Main/Image/"/>
-    <image id="lu84ty" name="Group 207.png" path="/Main_new/Main/Image/"/>
     <component id="lu84tz" name="PlayerHead_2.xml" path="/Main_new/Main/"/>
     <image id="l15av0" name="Group 26.png" path="/Main_new/Main/Image/"/>
     <image id="l15av2" name="Rectangle 39@3x.png" path="/Main_new/Main/Image/"/>
@@ -992,7 +989,6 @@
     <component id="l15av7" name="clearing.xml" path="/Main_new/Clearing/" exported="true"/>
     <image id="l15aw3" name="提示@3x.png" path="/Main_new/Main/Image/"/>
     <component id="t6zvw5" name="btn_setting.xml" path="/Main_new/Main/Component/"/>
-    <image id="t6zvw6" name="Group 196.png" path="/Main_new/Main/Image/"/>
     <component id="rw7jw9" name="Btn_Card_jiangxi_show_101.xml" path="/Main_new/Main/Component/allCardsToShow/"/>
     <component id="rw7jwa" name="Btn_Card_jiangxi_show_102.xml" path="/Main_new/Main/Component/allCardsToShow/"/>
     <component id="rw7jwb" name="Btn_Card_jiangxi_show_103.xml" path="/Main_new/Main/Component/allCardsToShow/"/>
@@ -1213,7 +1209,6 @@
     <image id="kzuz144" name="opt_hu_yes_sec.png" path="/Main_new/Main/Image/"/>
     <component id="kzuz148" name="btn_guohu.xml" path="/Main_new/Main/Component/"/>
     <component id="kzuz149" name="btn_buguohu.xml" path="/Main_new/Main/Component/"/>
-    <image id="kzuz14a" name="Group 346.png" path="/Main_new/Main/Image/"/>
     <component id="kzuz14b" name="comp_witness.xml" path="/Main_new/Main/Component/"/>
     <image id="kzuz14c" name="Group 241(1).png" path="/Main_new/Main/Image/"/>
     <image id="kzuz14d" name="Group 541.png" path="/Main_new/Main/Image/"/>
@@ -1223,7 +1218,6 @@
     <image id="sx7x14h" name="gamechatback2.png" path="/Main_new/Main/Image/"/>
     <component id="pbp614i" name="Btn_MessageTalk.xml" path="/Main_new/Chat/Component/"/>
     <image id="pbp614j" name="Group 205.png" path="/Main_new/Chat/Image/"/>
-    <image id="pbp614k" name="Group 205(1).png" path="/Main_new/Chat/Image/"/>
     <component id="ghku14l" name="btn_mul.xml" path="/Main_new/Main/Component/"/>
     <component id="tgj614m" name="Main_new_2.xml" path="/"/>
     <image id="tgj614n" name="a201_407.png" path="/images/cards2/1/"/>
@@ -1337,7 +1331,6 @@
     <image id="tgj617n" name="四连冠.png" path="/component/clearing/clearing1/"/>
     <image id="tgj617o" name="Group 76.png" path="/Main_new_2/Image/"/>
     <component id="tgj617p" name="Btn_MessageTalk.xml" path="/Main_new/Chat/Component/"/>
-    <image id="tgj617q" name="Group 205(1).png" path="/Main_new/Chat/Image/"/>
     <image id="tgj617r" name="Group 205.png" path="/Main_new/Chat/Image/"/>
     <component id="lj2n17s" name="btn_mul.xml" path="/Main_new/Main/Component/"/>
     <image id="lj2n17t" name="Record2_08.png" path="/Main_new/Main/Image/"/>
@@ -1399,6 +1392,18 @@
     <image id="ogdm19q" name="4928.png" path="/Main_new/record/font/"/>
     <font id="ogdm19r" name="MJ_recordSpeed.fnt" path="/Main_new/record/font/"/>
     <image id="ogdm19s" name="x.png" path="/Main_new/record/font/"/>
+    <image id="u63319t" name="button_voice.png" path="/Main_new/Chat/Image/"/>
+    <image id="u63319u" name="mj_club_yaoqingjulebu_btn.png" path="/Main_new/Main/Image/" scale9grid="23,57,37,48"/>
+    <image id="u63319v" name="button_setting.png" path="/Main_new/Main/Image/"/>
+    <image id="u63319w" name="btn_xiangq.png" path="/Main_new/Main/Image/"/>
+    <image id="u63319x" name="item_dianchi.png" path="/Main_new/Main/Image/"/>
+    <image id="u63319y" name="dismiss_room.png" path="/Main_new/Main/Image/"/>
+    <image id="u63319z" name="inivite_friend.png" path="/Main_new/Main/Image/"/>
+    <image id="u6331a0" name="Paizhuo_ziz_btn_zb_normal.png" path="/Main_new/Main/Image/"/>
+    <image id="u6331a1" name="button_wanfa.png" path="/Main_new/Main/Image/"/>
+    <image id="u6331a2" name="button_chat.png" path="/Main_new/Main/Image/"/>
+    <image id="u6331a3" name="looker.png" path="/Main_new/Main/Image/"/>
+    <image id="u6331a4" name="button_desk.png" path="/Main_new/Main/Image/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>