更新麻将新桌面

lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua

@@ -0,0 +1,56 @@
+local FamilyNumberDetail = import(".FamilyNumberDetail")
+
+local FamilyBanDeskmate = {}
+
+local M = FamilyBanDeskmate
+
+function FamilyBanDeskmate.new(root)
+    setmetatable(M, { __index = root })
+    local self = setmetatable({}, { __index = M })
+
+
+    local numbers = self._group.members
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    if #numbers == 0 then
+        ViewUtil.ShowModalWait()
+        fgCtr:FG_GroupMembers(self._group.id, 0, self._group.total_member_num, false, 1, function(res)
+            numbers = self._group.members
+            -- print("==========================res.Data.members")
+            pt(self._group.members)
+            ViewUtil:CloseModalWait()
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
+            else
+                self:GetAllDeskmate(numbers)
+            end
+        end)
+    else
+        self:GetAllDeskmate(numbers)
+    end
+    self:initBtn()
+    return self
+end
+
+function M:initBtn()
+
+end
+
+function M:GetAllDeskmate(numbers)
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    local Deskmate = {}
+    ViewUtil.ShowModalWait()
+    for i = 1, #numbers do
+        fgCtr:FG_GetBanTable(self._group.id, numbers[i].uid, function(res)
+            if res.ReturnCode == 0 then
+
+            else
+                ViewUtil.ErrorTip(res.ReturnCode, "获取禁止同桌列表失败！")
+            end
+            if i == #numbers then
+                ViewUtil:CloseModalWait()
+            end
+        end)
+    end
+end
+
+return M

lua_probject/base_project/Game/View/FamilyView.lua

@@ -8,6 +8,7 @@ local FamilyAllNumbers = import(".Family.FamilyAllNumbers")
 local FamilyNumberRecord = import(".Family.FamilyNumberRecord")
 local FamilyAuditNumber = import(".Family.FamilyAuditNumber")
 local FamilyJoinAndCreate = import(".Family.FamilyJoinAndCreate")
+local FamilyBanDeskmate = import(".Family.FamilyBanDeskmate")
 ---
 FamilyView = {}
 
@@ -122,7 +123,7 @@ end
 
 function M:BanFamily()
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    fgCtr:FG_UpdateGroupInfo(self._group.id, name, self._group.name, not self._group.ban, self._group.dissolve_opt,
+    fgCtr:FG_UpdateGroupInfo(self._group.id, self._group.name, "", not self._group.ban, self._group.dissolve_opt,
         self._group.kick_opt, self._group.apply, self._group.ban_chat1, self._group.ban_chat2, self._group.option, 0,
         function(res)
             if res.ReturnCode ~= 0 then
@@ -133,6 +134,10 @@ function M:BanFamily()
         end)
 end
 
+function M:BanDeskmate()
+    self._child_familyAllNumbers = FamilyBanDeskmate.new(self)
+end
+
 function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type)
     local list_familyNumber = self._view:GetChild('list_familyNumber')
     list_familyNumber:SetVirtual()
@@ -162,6 +167,7 @@ function M:ConnetFamilyRoom(fgCtr, id)
             ViewUtil.ErrorTip(res.ReturnCode, "获取房间列表列表失败")
         else
             self:UpdateFamilyRoom(fgCtr, id)
+            self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
             return 1
         end
     end)
@@ -311,8 +317,7 @@ function M:ConnetFamily(index, groups, isCreate)
     list_family:SetVirtual()
     self._group = DataManager.groups:get(groups[index].id)
     self._view:GetChild('text_familyId').text = self._group.id
-    self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
+    print("===================================self._group")
-    -- print("===================================self._group")
     pt(self._group)
     self._roomNum = self._group.room_num
 
@@ -510,7 +515,7 @@ local MORE_LIST = {
     },
     {
         name = "禁止同桌",
-        Fct = M.ShareWx
+        Fct = M.BanDeskmate
     },
     {
         name = "关闭聊天室",

lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua

@@ -1024,7 +1024,7 @@ function M:UpdateHandCardsPos()
         card_view.index = i
         card_view.btn_card.touchable = true
         self:UpdateCardMove(card_view.btn_card, false, false)
-        self:SetBtnCardColor(card_view, 0)
+        self:SetBtnCardColor(card_view, 1)
     end
 end
 

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+  </displayList>
+  <Button mode="Check"/>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.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="-26,-104" size="184,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
+    <text id="n47_nkur" name="tuoguanTips" xy="-26,-84" size="184,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
-      <gearXY controller="site" pages="2,1" values="-26,-104|154,50" default="-85,-104"/>
+      <gearXY controller="site" pages="2,1" values="-26,-84|154,50" default="-85,-104"/>
       <relation target="" sidePair="center-center,top-top"/>
     </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">
@@ -39,8 +39,8 @@
       <gearDisplay controller="read" pages="1"/>
       <relation target="" sidePair="top-bottom"/>
     </image>
-    <text id="n48_pkx5" name="name" xy="-47,-56" size="226,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="萌萌砂带回家大家肯定会">
+    <text id="n48_pkx5" name="name" xy="-47,-46" size="226,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="萌萌砂带">
-      <gearXY controller="site" pages="2,0,1" values="-47,-56|-37,-57|150,0"/>
+      <gearXY controller="site" pages="2,0,1" values="-47,-46|-37,-57|150,0"/>
       <relation target="" sidePair="center-center,top-top"/>
     </text>
     <component id="n31_e54q" name="chat" src="gq7m6b" fileName="component/MsgBubble2.xml" xy="-32,-82" size="197,103" alpha="0" touchable="false"/>
@@ -60,12 +60,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="53,132" 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="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">
       <gearColor controller="text_color" pages="1" values="#ff0000,#000000" default="#ffffff,#000000"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </text>
-    <group id="n46_rfcn" name="zhanji" xy="53,132" size="25,49" advanced="true">
+    <group id="n46_rfcn" name="zhanji" xy="53,126" size="25,49" advanced="true">
-      <gearXY controller="site" pages="2,1" values="53,132|154,97" default="29,136"/>
+      <gearXY controller="site" pages="2,1" values="53,126|154,97" default="29,136"/>
     </group>
   </displayList>
 </component>

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

@@ -34,9 +34,9 @@
     <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="146,18" size="226,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" autoSize="shrink" bold="true" singleLine="true" text="萌萌六个字了">
+    <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="萌萌六个字了">
-      <gearXY controller="site" pages="2,0,1" values="146,18|-33,-57|154,0"/>
+      <gearXY controller="site" pages="2,0,1" values="136,18|-33,-57|154,0"/>
-      <relation target="" sidePair="left-left,top-top"/>
+      <relation target="" sidePair="left-left,bottom-middle"/>
     </text>
     <component id="n31_e54q" name="chat" src="gq7m6b" fileName="component/MsgBubble2.xml" xy="-23,-81" size="197,103" alpha="0" touchable="false"/>
     <component id="n27_e54q" name="face" src="gq7m5x" fileName="component/Face3.xml" xy="99,-88" 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="146,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="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">
       <gearColor controller="text_color" pages="1" values="#ff0000,#000000" default="#ffffff,#000000"/>
-      <relation target="" sidePair="left-left,bottom-bottom"/>
+      <relation target="" sidePair="left-left,top-middle"/>
     </text>
-    <group id="n46_rfcn" name="zhanji" xy="146,64" size="29,58" advanced="true">
+    <group id="n46_rfcn" name="zhanji" xy="136,64" size="29,58" advanced="true">
-      <gearXY controller="site" pages="2,1" values="146,64|154,97" default="29,136"/>
+      <gearXY controller="site" pages="2,1" values="136,64|154,97" default="29,136"/>
     </group>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/Comp_2_OutCard.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="78,111">
+<component size="117,117" pivot="0.5,0.5">
   <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="0,112" size="78,111" skew="180,0" url="ui://Main_Majiang/202_101" fill="scaleFree">
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="180,0" url="ui://Main_Majiang/b202_101" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,112" size="42,45" aspect="true" skew="180,0">
+    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="4,81" pivot="0.5,0.5" size="58,36" aspect="true" skew="180,0">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>

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

@@ -8,7 +8,7 @@
   <controller name="tip" pages="0,,1," selected="0"/>
   <displayList>
     <component id="n24" name="mask_liangpai" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="666,-1180" size="1,1"/>
-    <text id="n36_gi99" name="Text_CardInfo" xy="984,322" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;a201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
+    <text id="n36_gi99" name="Text_CardInfo" xy="984,322" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
     <list id="n33_gi99" name="List_FZ" xy="0,34" size="2400,211" touchable="false" layout="row" selectionMode="none" colGap="40" defaultItem="ui://v0j9abjygi9910f" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="146,210" extention="Button">
+<component size="168,186" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="jing" pages="0,,1," selected="0"/>
   <controller name="move" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="0,0" size="146,210" url="ui://Main_Majiang/a201_101" fill="scale">
+    <loader id="n3_hp0b" name="icon" xy="0,0" size="168,186" url="ui://Main_Majiang/b201_101" fill="scale">
       <gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,-1" size="73,76" aspect="true">
+    <image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,-1" size="95,52" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <gearXY controller="button" pages="0,1" values="3,-1|0,-22" duration=".1"/>
       <gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="346,173">
+<component size="458,158">
-  <controller name="isFour" pages="0,,1," selected="0"/>
+  <controller name="isFour" pages="0,,1," selected="1"/>
   <controller name="seat" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <component id="n0_gi99" name="Comp_Card1" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="0,0"/>
-    <component id="n1_gi99" name="Comp_Card2" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="111,0"/>
+    <component id="n1_gi99" name="Comp_Card2" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="150,0" size="158,158"/>
-    <component id="n2_gi99" name="Comp_Card3" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="222,0"/>
+    <component id="n2_gi99" name="Comp_Card3" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="300,0" size="158,158"/>
-    <component id="n3_gi99" name="Comp_Card4" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="111,-24">
+    <component id="n3_gi99" name="Comp_Card4" src="gi9910g" fileName="Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml" xy="150,-27">
       <gearDisplay controller="isFour" pages="1"/>
     </component>
-    <image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="155,63" pivot="0.5,0.5" rotation="-90">
+    <image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="216,14" pivot="0.5,0.5" size="30,32" rotation="-90">
-      <gearXY controller="seat" default="155,63"/>
+      <gearXY controller="seat" pages="0,1,2,3" values="216,14|216,14|216,14|216,14"/>
       <gearLook controller="seat" pages="0,1,3" values="1,180,0,0|1,90,0,0|1,-90,0,0" default="1,0,0,0"/>
     </image>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_1_FZ_Card.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="123,173">
+<component size="158,158">
   <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="0,0" size="123,173" url="ui://Main_Majiang/202_101" fill="scale">
+    <loader id="n0_gi99" name="icon" xy="0,0" size="158,158" url="ui://Main_Majiang/b202_101" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="78,82" aspect="true">
+    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="113,67" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="158,79">
+<component size="236,83">
   <controller name="isFour" pages="0,,1," selected="0"/>
   <controller name="seat" pages="0,,1,,2,,3," selected="3"/>
   <displayList>
     <component id="n0_gi99" name="Comp_Card1" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="0,0"/>
-    <component id="n1_gi99" name="Comp_Card2" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="51,0"/>
+    <component id="n1_gi99" name="Comp_Card2" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="77,0"/>
-    <component id="n2_gi99" name="Comp_Card3" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="102,0"/>
+    <component id="n2_gi99" name="Comp_Card3" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="154,0"/>
-    <component id="n3_gi99" name="Comp_Card4" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="51,-10">
+    <component id="n3_gi99" name="Comp_Card4" src="gi9910n" fileName="Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml" xy="77,-13">
       <gearDisplay controller="isFour" pages="1"/>
     </component>
-    <image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="61,16" pivot="0.5,0.5" rotation="-90">
+    <image id="n4_qz7i" name="n4" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="103,14" pivot="0.5,0.5" size="30,32" rotation="-90">
       <gearLook controller="seat" pages="0,1,3" values="1,180,0,0|1,90,0,0|1,-90,0,0" default="1,0,0,0"/>
     </image>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_2_FZ_Card.xml

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="56,79">
+<component size="83,83">
   <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="0,0" size="56,79" url="ui://Main_Majiang/202_101" fill="scale"/>
+    <loader id="n0_gi99" name="icon" xy="0,0" size="83,83" url="ui://Main_Majiang/b202_101" fill="scale">
-    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="28,29" aspect="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="41,42" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
-      <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
     </image>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="173,87">
+<component size="242,85">
   <controller name="isFour" pages="0,,1," selected="0"/>
   <controller name="seat" pages="0,,1,,2,,3," selected="0"/>
   <displayList>
     <component id="n0_gi99" name="Comp_Card1" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="0,0"/>
-    <component id="n1_gi99" name="Comp_Card2" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="56,0"/>
+    <component id="n1_gi99" name="Comp_Card2" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="79,0" size="85,85"/>
-    <component id="n2_gi99" name="Comp_Card3" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="112,0"/>
+    <component id="n2_gi99" name="Comp_Card3" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="158,0" size="85,85"/>
-    <component id="n3_gi99" name="Comp_Card4" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="56,-12">
+    <component id="n3_gi99" name="Comp_Card4" src="gi9910s" fileName="Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml" xy="79,-15">
       <gearDisplay controller="isFour" pages="1"/>
     </component>
-    <image id="n5_qz7i" name="n5" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="68,20" pivot="0.5,0.5" rotation="180">
+    <image id="n5_qz7i" name="n5" src="qz7i11n" fileName="Main_new/Main/Image/Polygon 7.png" xy="106,14" pivot="0.5,0.5" size="30,32" rotation="180">
       <gearLook controller="seat" pages="0,1,3" values="1,180,0,0|1,90,0,0|1,-90,0,0" default="1,0,0,0"/>
     </image>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_3_FZ_Card.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="61,87">
+<component size="85,85">
-  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="0,0" size="61,87" url="ui://Main_Majiang/202_101" fill="scale">
+    <loader id="n0_gi99" name="icon" xy="0,0" size="85,85" url="ui://Main_Majiang/b202_101" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="31,32" aspect="true">
+    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,0" size="44,45" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard2.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="79,112">
+<component size="117,117">
   <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="79,112" size="79,112" skew="180,180" url="ui://Main_Majiang/202_101" fill="scaleFree">
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="180,180" url="ui://Main_Majiang/b202_101" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="79,112" size="39,41" aspect="true" skew="180,180">
+    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="56,82" pivot="0.5,0.5" size="58,34" aspect="true" skew="180,180">
       <gearDisplay controller="jing" pages="1"/>
-      <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
+      <relation target="" sidePair="width-width%,height-height%,left-left%,top-top%"/>
     </image>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard3.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="78,112">
+<component size="117,117">
   <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="79,0" size="78,112" skew="0,180" url="ui://Main_Majiang/202_101" fill="scaleFree">
+    <loader id="n0_gi99" name="icon" xy="0,0" pivot="0.5,0.5" size="117,117" skew="0,180" url="ui://Main_Majiang/b202_101" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="79,0" size="38,41" aspect="true" skew="0,180">
+    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="114,1" size="58,34" aspect="true" skew="0,180">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_4_OutCard4.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="79,112">
+<component size="117,117">
-  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="jing" pages="0,,1," selected="1"/>
   <displayList>
-    <loader id="n0_gi99" name="icon" xy="0,0" size="79,112" url="ui://Main_Majiang/202_101" fill="scaleFree">
+    <loader id="n0_gi99" name="icon" xy="0,0" size="117,117" url="ui://Main_Majiang/b202_101" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="0,0" size="39,41" aspect="true">
+    <image id="n1_gi99" name="n1" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,0" size="58,60" aspect="true">
       <gearDisplay controller="jing" pages="1"/>
       <relation target="" sidePair="width-width,height-height,left-left,top-top"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="71,129">
+<component size="63,117">
   <displayList>
-    <loader id="n0_gi99" name="n0" xy="71,0" size="71,129" skew="0,180" url="ui://v0j9abjygq7ma8" fill="scale">
+    <loader id="n0_gi99" name="n0" xy="0,0" pivot="0.5,0.5" size="63,117" skew="0,180" url="ui://v0j9abjyk0pa13k" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard3.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="80,101">
+<component size="91,99">
   <displayList>
-    <loader id="n0_gi99" name="n0" xy="0,1" size="80,101" url="ui://v0j9abjygq7ma6" align="center" vAlign="middle" fill="scaleFree">
+    <loader id="n0_gi99" name="n0" xy="0,0" size="91,99" url="ui://v0j9abjyk0pa13l" align="center" vAlign="middle" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="71,129">
+<component size="63,117">
   <displayList>
-    <loader id="n0_gi99" name="n0" xy="0,0" size="71,129" url="ui://v0j9abjygq7maa" fill="scale"/>
+    <loader id="n0_gi99" name="n0" xy="0,0" size="63,117" url="ui://v0j9abjyk0pa13k" fill="scale">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_1.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1981,211" opaque="false" initName="player_card_info">
+<component size="2517,186" opaque="false" initName="player_card_info">
   <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"/>
@@ -22,14 +22,13 @@
       <gearDisplay controller="ting" pages="1"/>
       <gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
     </image>
-    <text id="n36_gi99" name="Text_CardInfo" xy="900,258" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;a201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
+    <text id="n36_gi99" name="Text_CardInfo" xy="900,258" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b201_&quot;,&#xA;&quot;Order&quot;:&quot;desc&quot;,&#xA;&quot;Pos_X&quot;:57&#xA;}"/>
-    <list id="n33_gi99" name="List_FZ" xy="0,34" size="1981,173" touchable="false" layout="row" selectionMode="none" colGap="40" defaultItem="ui://v0j9abjygi9910f" autoClearItems="true">
+    <list id="n33_gi99" name="List_FZ" xy="0,12" size="2517,158" touchable="false" layout="row" selectionMode="none" colGap="16" defaultItem="ui://v0j9abjygi9910f" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
     </list>
-    <list id="n32_kxhm" name="List_HandCard" xy="0,0" size="1778,210" layout="row" colGap="-10" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
+    <list id="n32_kxhm" name="List_HandCard" xy="0,0" size="2295,186" layout="row" colGap="-4" defaultItem="ui://v0j9abjygi9910i" align="right" autoClearItems="true">
-      <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
       <item/>
@@ -45,8 +44,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n35_gi99" name="List_OutCard" xy="446,-875" pivot="1,1" size="736,413" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-11" colGap="-6" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
+    <list id="n35_gi99" name="List_OutCard" xy="794,-555" pivot="0.5,0.5" size="880,502" skew="180,0" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910j" renderOrder="descent" autoClearItems="true">
-      <item/>
       <item/>
       <item/>
       <item/>
@@ -80,9 +78,9 @@
       <item/>
       <item/>
     </list>
-    <list id="n38_shqd" name="Btn_HandCard" xy="1835,0" size="146,210" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard">
+    <list id="n38_shqd" name="Btn_HandCard" xy="2349,3" size="168,186" defaultItem="ui://v0j9abjygi9910i" selectionController="seletedGetCard" autoClearItems="true">
       <gearDisplay controller="getCard" pages="1"/>
-      <relation target="" sidePair="right-right,top-top"/>
+      <item/>
     </list>
     <graph id="n40_ckvb" name="area_allDown" xy="0,-283" size="1978,264" type="rect" lineSize="0" fillColor="#00ffffff"/>
     <component id="n39_nee3" name="Comp_FZTips" src="nee311b" fileName="Main_new/FZTips/Comp_FZTips.xml" xy="-325,-170">

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_2.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="71,743" opaque="false" initName="player_card_info">
+<component size="63,714" opaque="false" initName="player_card_info">
   <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="1"/>
+  <controller name="getCard" pages="0,,1," selected="0"/>
   <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"/>
@@ -20,15 +20,13 @@
       <gearDisplay controller="ting" pages="1"/>
       <gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
     </image>
-    <text id="n36_gi99" name="Text_CardInfo" xy="66,861" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:28,&#xA;&quot;Order&quot;:&quot;desc&quot;&#xA;}"/>
+    <text id="n36_gi99" name="Text_CardInfo" xy="66,861" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:28,&#xA;&quot;Order&quot;:&quot;desc&quot;&#xA;}"/>
-    <list id="n38_gi99" name="List_FZ" xy="108,334" size="158,400" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" vAlign="bottom" autoClearItems="true">
+    <list id="n38_gi99" name="List_FZ" xy="110,283" size="237,503" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" vAlign="bottom" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
+      <item/>
     </list>
-    <list id="n41_gi99" name="List_OutCard" xy="-786,-692" pivot="1,1" size="371,709" skew="180,180" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-13" colGap="-6" defaultItem="ui://v0j9abjygi9910o" renderOrder="descent" autoClearItems="true">
+    <list id="n41_gi99" name="List_OutCard" xy="-961,51" pivot="0.5,0.5" size="935,699" skew="180,180" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910o" renderOrder="descent" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
       <item/>
       <item/>
       <item/>
@@ -51,10 +49,10 @@
       <item/>
       <item/>
     </list>
-    <list id="n44_ckvb" name="Comp_HandCard" xy="0,0" size="71,129" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
+    <list id="n44_ckvb" name="Comp_HandCard" xy="0,1" size="63,117" touchable="false" selectionMode="none" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
       <item/>
     </list>
-    <list id="n37_gi99" name="List_HandCard" xy="0,95" size="71,648" touchable="false" selectionMode="none" lineGap="-86" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
+    <list id="n37_gi99" name="List_HandCard" xy="0,117" size="63,597" touchable="false" selectionMode="none" lineGap="-77" defaultItem="ui://v0j9abjygi9910l" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_3.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1031,101" opaque="false" initName="player_card_info">
+<component size="1347,101" opaque="false" initName="player_card_info">
   <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"/>
@@ -20,8 +20,8 @@
       <gearDisplay controller="ting" pages="1"/>
       <gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
     </image>
-    <text id="n36_gi99" name="Text_CardInfo" xy="5,-1188" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}"/>
+    <text id="n36_gi99" name="Text_CardInfo" xy="5,-1189" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}"/>
-    <list id="n37_gi99" name="List_HandCard" xy="127,-2" size="904,101" touchable="false" layout="row" selectionMode="none" colGap="-11" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
+    <list id="n37_gi99" name="List_HandCard" xy="125,0" size="1222,99" touchable="false" layout="row" selectionMode="none" colGap="-10" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
@@ -30,15 +30,21 @@
       <item/>
       <item/>
       <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
     </list>
-    <list id="n38_gi99" name="List_FZ" xy="18,14" size="1013,87" touchable="false" layout="row" selectionMode="none" colGap="33" defaultItem="ui://v0j9abjygi9910r" align="right" autoClearItems="true">
+    <list id="n38_gi99" name="List_FZ" xy="18,16" size="1329,85" touchable="false" layout="row" selectionMode="none" colGap="4" defaultItem="ui://v0j9abjygi9910r" align="right" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
     </list>
-    <list id="n41_gi99" name="List_OutCard" xy="-526,166" pivot="1,1" size="736,417" skew="0,180" touchable="false" pageController="ting" layout="flow_hz" selectionMode="none" lineGap="-13" colGap="-6" defaultItem="ui://v0j9abjygi9910t" autoClearItems="true">
+    <list id="n41_gi99" name="List_OutCard" xy="285,173" pivot="0.5,0.5" size="880,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/>
       <item/>
       <item/>
@@ -64,7 +70,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n43_nee3" name="Comp_HandCard" xy="0,0" size="80,101" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
+    <list id="n43_nee3" name="Comp_HandCard" xy="0,0" size="91,99" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910q" autoClearItems="true">
       <gearDisplay controller="getCard" pages="1"/>
       <item/>
     </list>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Player_card_info_4.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="71,714" opaque="false" initName="player_card_info">
+<component size="63,714" opaque="false" initName="player_card_info">
   <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"/>
@@ -20,11 +20,8 @@
       <gearDisplay controller="ting" pages="1"/>
       <gearXY controller="3d" pages="0" values="616,-1303" default="616,100"/>
     </image>
-    <text id="n36_gi99" name="Text_CardInfo" xy="71,658" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}"/>
+    <text id="n36_gi99" name="Text_CardInfo" xy="71,658" size="813,973" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;FZ_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Out_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Hand_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;b202_&quot;,&#xA;&quot;Get_Card&quot;:&quot;100&quot;,&#xA;&quot;Pos_Y&quot;:-28,&#xA;&quot;Order&quot;:&quot;asc&quot;&#xA;}"/>
-    <list id="n37_gi99" name="List_HandCard" xy="0,0" pivot="1,1" size="71,633" touchable="false" selectionMode="none" lineGap="-87" defaultItem="ui://v0j9abjygi9910w" vAlign="bottom" autoClearItems="true">
+    <list id="n37_gi99" name="List_HandCard" xy="0,0" pivot="1,1" size="63,597" touchable="false" selectionMode="none" lineGap="-77" defaultItem="ui://v0j9abjygi9910w" vAlign="bottom" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
       <item/>
       <item/>
       <item/>
@@ -36,12 +33,14 @@
       <item/>
       <item/>
     </list>
-    <list id="n38_gi99" name="List_FZ" xy="-281,94" size="158,290" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" autoClearItems="true">
+    <list id="n38_gi99" name="List_FZ" xy="-263,27" size="237,503" touchable="false" selectionMode="none" lineGap="-9" defaultItem="ui://v0j9abjygi9910m" autoClearItems="true">
       <relation target="n37_gi99" sidePair="right-left,top-top"/>
       <item/>
       <item/>
+      <item/>
+      <item/>
     </list>
-    <list id="n41_gi99" name="List_OutCard" xy="124,46" pivot="1,1" size="371,709" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-13" colGap="-6" defaultItem="ui://v0j9abjygi9910x" autoClearItems="true">
+    <list id="n41_gi99" name="List_OutCard" xy="91,0" pivot="0.5,0.5" size="935,699" touchable="false" pageController="ting" layout="flow_vt" selectionMode="none" lineGap="-20" colGap="-8" defaultItem="ui://v0j9abjygi9910x" autoClearItems="true">
       <relation target="n37_gi99" sidePair="left-right,top-top"/>
       <item/>
       <item/>
@@ -64,14 +63,10 @@
       <item/>
       <item/>
       <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
     </list>
-    <list id="n43_nee3" name="Comp_HandCard" xy="0,585" size="71,129" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910w">
+    <list id="n43_nee3" name="Comp_HandCard" xy="0,597" size="63,117" touchable="false" overflow="scroll" defaultItem="ui://v0j9abjygi9910w" autoClearItems="true">
       <gearDisplay controller="getCard" pages="1"/>
+      <item/>
     </list>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -1,49 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" 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="0"/>
   <displayList>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1194,909" scale="1.2,1.2">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="71,784" size="144,144">
-      <gearDisplay controller="state" pages="0,2"/>
+      <gearDisplay controller="state" pages="0,1,2,3"/>
-      <gearXY controller="state" pages="1" values="80,654" default="1194,909"/>
+      <gearXY controller="state" pages="1" values="71,784" default="1188,897"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1194,909">
+    <component id="n141_lu84" name="player_info1_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="75,809" visible="false">
       <gearDisplay controller="state" pages="1,3"/>
-      <gearXY controller="state" pages="1" values="54,983" default="1194,909"/>
+      <gearXY controller="state" pages="1" values="75,809" default="749,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" scale="1.2,1.2">
+    <component id="n116_pkx5" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2334,285" size="108,108">
-      <gearDisplay controller="state" pages="0,2"/>
+      <gearDisplay controller="state" pages="0,1,2,3"/>
-      <gearXY controller="state" pages="0,1,2" values="1888,519|2004,77|1888,519" default="1194,274"/>
+      <gearXY controller="state" pages="0,1,2" values="1888,531|2334,285|1888,531" default="1194,286"/>
       <relation target="" sidePair="middle-middle"/>
     </component>
-    <component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2321,278">
+    <component id="n140_lu84" name="player_info2_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2314,218" visible="false">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n154_gi99" sidePair="left-right,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info3_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1194,274" scale="1.2,1.2">
+    <component id="n150_kxhm" name="player_info3_1" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1885,27" size="108,108">
-      <gearDisplay controller="state" pages="0,2"/>
+      <gearDisplay controller="state" pages="0,1,2,3"/>
-      <gearXY controller="state" pages="0,1,2" values="1194,274|80,654|1194,274" default="1194,909"/>
+      <gearXY controller="state" pages="0,1,2" values="1206,274|1885,27|1206,274" default="1206,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1888,519">
+    <component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1916,39" visible="false">
       <gearDisplay controller="state" pages="1,3"/>
-      <gearXY controller="state" pages="0,1" values="1888,519|1773,39" default="1194,909"/>
+      <gearXY controller="state" pages="0,1" values="2031,519|1916,39" default="1337,909"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
     </component>
-    <component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="512,519" scale="1.2,1.2">
+    <component id="n151_kxhm" name="player_info4_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="89,569" size="108,108">
-      <gearDisplay controller="state" pages="0,2"/>
+      <gearDisplay controller="state" pages="0,1,2,3"/>
-      <gearXY controller="state" pages="0,1,2" values="512,519|80,654|512,519" default="1194,909"/>
+      <gearXY controller="state" pages="0,1,2" values="536,531|89,569|536,531" default="1218,921"/>
       <relation target="" sidePair="middle-middle,right-left"/>
     </component>
-    <component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="512,519">
+    <component id="n153_kxhm" name="player_info4_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="51,671" visible="false">
       <gearDisplay controller="state" pages="1,3"/>
-      <gearXY controller="state" pages="0,1" values="512,519|77,631" default="1194,909"/>
+      <gearXY controller="state" pages="0,1" values="486,559|51,671" default="1168,949"/>
       <relation target="n156_gi99" sidePair="right-left,bottom-bottom"/>
     </component>
     <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1278,-294" pivot="0.5,0.5">
@@ -51,28 +52,10 @@
       <gearXY controller="3d" pages="0,1" values="1278,-294|603,254"/>
     </component>
     <component id="n71_l2u4" name="com_roominfo" src="gq7m2z" fileName="Main_style_2/component/room_info/RightPanel(1).xml" xy="357,-1170" size="1329,102" group="n90_8sat" scale="1.5,1.5"/>
-    <component id="n88_8sat" name="btn_rule" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="-383,-885" group="n90_8sat"/>
+    <component id="n88_8sat" name="btn_rule--" src="gq7m4l" fileName="Main_style_2/poker/Btn_log.xml" xy="-383,-885" group="n90_8sat"/>
     <component id="n89_8sat" name="btn_back_jiesan" src="gq7m4n" fileName="Main_style_2/poker/Btn_back_jiesan.xml" xy="2099,-382" size="110,75" group="n90_8sat" scale="2,2">
       <gearDisplay controller="state" pages="1,2"/>
     </component>
-    <text id="n157_ckvb" name="remaining_card" xy="897,469" size="215,74" group="n161_ckvb" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="余999张">
-      <gearDisplay controller="state" pages="1,3"/>
-      <relation target="n159_ckvb" sidePair="right-left"/>
-    </text>
-    <text id="n158_ckvb" name="wanfa_text" xy="418,599" pivot="0.5,0" size="1696,56" group="n161_ckvb" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
-      <gearDisplay controller="state" pages="1,3"/>
-      <relation target="" sidePair="center-center"/>
-    </text>
-    <component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1136,375" group="n161_ckvb">
-      <gearDisplay controller="state" pages="1,3"/>
-    </component>
-    <text id="n160_ckvb" name="text_round" xy="1418,469" size="241,74" group="n161_ckvb" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="局数:1\81">
-      <gearDisplay controller="state" pages="1,3"/>
-      <relation target="n159_ckvb" sidePair="left-right"/>
-    </text>
-    <group id="n161_ckvb" name="center" xy="418,375" size="1696,280" advanced="true">
-      <relation target="" sidePair="center-center,right-right"/>
-    </group>
     <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="2926,-501" size="58,75" group="n90_8sat" scale="2,2">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
@@ -152,27 +135,70 @@
     </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"/>
     <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,36" group="n138_lu84"/>
-    <group id="n138_lu84" name="top_right" xy="2232,36" size="120,120"/>
+    <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">
+      <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
+      <Button icon="ui://v0j9abjygmbn13t" 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">
+      <gearDisplay controller="more" pages="1"/>
+      <Button checked="true" icon="ui://v0j9abjygmbn13p"/>
+    </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"/>
+    </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">
+      <gearDisplay controller="more" pages="1"/>
+      <Button icon="ui://v0j9abjygmbn13q"/>
+    </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">
+      <gearDisplay controller="more" pages="1"/>
+      <Button icon="ui://v0j9abjygmbn13r"/>
+    </component>
+    <group id="n138_lu84" name="top_right" xy="2031,33" size="468,453"/>
+    <text id="n157_ckvb" name="remaining_card" xy="897,469" size="215,74" group="n161_ckvb" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="余999张">
+      <gearDisplay controller="state" pages="1,3"/>
+      <relation target="n159_ckvb" sidePair="right-left"/>
+    </text>
+    <text id="n158_ckvb" name="wanfa_text" xy="418,599" pivot="0.5,0" size="1696,56" group="n161_ckvb" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍玩法介绍&#xA;">
+      <gearDisplay controller="state" pages="1,3"/>
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <text id="n160_ckvb" name="text_round" xy="1418,469" size="241,74" group="n161_ckvb" font="ui://27vd145bh35o7ik0" fontSize="56" color="#cccccc" align="center" vAlign="middle" bold="true" text="局数:1\81">
+      <gearDisplay controller="state" pages="1,3"/>
+      <relation target="n159_ckvb" sidePair="left-right"/>
+    </text>
+    <group id="n161_ckvb" name="center_text" xy="418,469" size="1696,186" advanced="true">
+      <relation target="" sidePair="center-center,right-right"/>
+    </group>
     <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"/>
     <component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="48,48" group="n135_lu84">
       <ProgressBar value="50" max="100"/>
     </component>
-    <text id="n136_lu84" name="text_roomId" xy="43,117" size="228,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="房间：123456"/>
+    <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">
-    <group id="n135_lu84" name="top_left" xy="43,44" size="228,122"/>
+      <gearDisplay controller="more" pages="1"/>
-    <component id="n154_gi99" name="player_card_info2" src="gi9910k" fileName="Main_new/Main_new_4/Player_card_info_2.xml" xy="2129,213">
+      <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"/>
+    <group id="n135_lu84" name="top_left" xy="43,44" size="228,171"/>
+    <component id="n154_gi99" name="player_card_info2" src="gi9910k" fileName="Main_new/Main_new_4/Player_card_info_2.xml" xy="2130,153">
       <gearDisplay controller="state" pages="1,3"/>
     </component>
-    <component id="n155_gi99" name="player_card_info3" src="gi9910p" fileName="Main_new/Main_new_4/Player_card_info_3.xml" xy="688,33">
+    <component id="n155_gi99" name="player_card_info3" src="gi9910p" fileName="Main_new/Main_new_4/Player_card_info_3.xml" xy="515,33">
       <gearDisplay controller="state" pages="1,3"/>
     </component>
-    <component id="n156_gi99" name="player_card_info4" src="gi9910v" fileName="Main_new/Main_new_4/Player_card_info_4.xml" xy="336,164">
+    <component id="n156_gi99" name="player_card_info4" src="gi9910v" fileName="Main_new/Main_new_4/Player_card_info_4.xml" xy="310,204">
       <gearDisplay controller="state" pages="1,3"/>
     </component>
-    <component id="n118_pkx5" name="player_card_info1" src="kxhm10e" fileName="Main_new/Main_new_4/Player_card_info_1.xml" xy="452,968">
+    <component id="n118_pkx5" name="player_card_info1" src="kxhm10e" fileName="Main_new/Main_new_4/Player_card_info_1.xml" xy="7,975">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <text id="n162_qz7i" name="text_testName" xy="47,178" size="266,49" fontSize="36" color="#ffffff" bold="true" text="|一个玩家的名字"/>
+    <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">
+      <gearDisplay controller="state" pages="1,3"/>
+    </component>
+    <group id="n169_gmbn" name="conter_box" xy="1136,375" size="258,258"/>
     <graph id="n146_l15a" name="btn_showNext" xy="1121,424" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
       <gearDisplay controller="state" pages="1"/>
     </graph>