0331

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPartnerStatView.lua

@@ -54,7 +54,7 @@ function M:InitView()
             self.begin_time, self.end_time = self.time_panel:GetDate()
             self.record_data = {}
             self.record_data.numItems = 0
-            self:GetRecordData(0)
+            self:GetRecoedData(0)
         end, { showDay = group.lev < 3 and 30 or 7 })
 
     local ctr_page = self._view:GetController("type")

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

@@ -190,15 +190,15 @@ function M:InitView(url)
     self._view:GetChild('info_text'):GetChild('text').text = room.room_config:GetDes()
     if room.room_config.Leaf == 1 then
         if room.room_config.people_num == 2 then
-            self._view:GetChild('wanfa_text').text = '二人跑得快' .. room.score_times
+            self._view:GetChild('wanfa_text').text = '跑得快' .. room.score_times
         else
-            self._view:GetChild('wanfa_text').text = '三人跑得快' .. room.score_times
+            self._view:GetChild('wanfa_text').text = '跑得快' .. room.score_times
         end
     else
         if room.room_config.people_num == 2 then
-            self._view:GetChild('wanfa_text').text = '二人跑得快' .. room.score_times
+            self._view:GetChild('wanfa_text').text = '跑得快' .. room.score_times
         else
-            self._view:GetChild('wanfa_text').text = '三人跑得快' .. room.score_times
+            self._view:GetChild('wanfa_text').text = '跑得快' .. room.score_times
         end
     end
     local text_playName = self._view:GetChild('text_playName')

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

@@ -342,6 +342,9 @@ function M:AddTouchMoveEvent(list)
             local columnGap = self._view_handCard.columnGap
             local oneCardWidth = CardWidth - columnGap
             local xy = fristCard:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
+            if xy.y <= 0 then
+                return
+            end
             -- if xy.y > -21 and xy.y < 316 then
             self.touchBegin = xy
             Stage.inst.onTouchMove:Add(self.touchMoveFun)

lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua

@@ -158,7 +158,7 @@ function M:NewPlayerCardInfoView(view, index)
 end
 
 function M:closeTipOnTuoguan()
-    printlog("closeTipOnTuoguan",self._clearingView)
+    printlog("closeTipOnTuoguan", self._clearingView)
     if self._clearingView ~= nil then
         self._clearingView:Close()
     end
@@ -777,7 +777,8 @@ function M:__FangziTip(tip, _uid, fptype)
         _chipeng_tip:Dispose()
         self._chipeng_tip = nil
     else
-        self._view:AddChild(_chipeng_tip)
+        local index = self._view:GetChildIndex(self._view:GetChild('safe_close'))
+        self._view:AddChildAt(_chipeng_tip,index)
         _chipeng_tip:Center()
         _chipeng_tip.x = _chipeng_tip.x + 750
         _chipeng_tip.y = _chipeng_tip.y - 100

lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPMainView.lua

@@ -194,6 +194,12 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
             self:BtnsSafe()
         end
     )
+    local safe_close = self._view:GetChild('safe_close')
+    safe_close.onClick:Set(
+        function()
+            self:BtnsSafe()
+        end
+    )
     self:BtnsSafe()
 end
 
@@ -203,11 +209,17 @@ function M:BtnsSafe()
     local btn_temp2 = self._view:GetChild("Btn_jiesan_lobby")
     local btn_temp3 = self._view:GetChild("btn_leave_lobby")
     local btn_temp4 = self._view:GetChild("btn_setting")
+    local safe_close = self._view:GetChild('safe_close')
+    local btn_rule = self._view:GetChild('btn_rule')
+    local gcm_chat = self._view:GetChild('gcm_chat')
 
     btn_temp1.visible = not btn_temp1.visible
     btn_temp2.visible = not btn_temp2.visible
     btn_temp3.visible = not btn_temp3.visible
     btn_temp4.visible = not btn_temp4.visible
+    safe_close.visible = not safe_close.visible
+    btn_rule.visible = not btn_rule.visible
+    gcm_chat.visible = not gcm_chat.visible
 
     local safe = self._view:GetChild("safe_bg")
     safe.visible = not safe.visible

lua_probject/extend_project/extend/zipai/fanpaofa/main/ZPPlayerSelfCardInfoView.lua

@@ -795,8 +795,7 @@ end
 --计算手牌位置
 function M:GetHandCardPos(cards_view, cards)
     local x, y = 0, 0
-    local card_width = self.card_width - (self._room.change_card_display == "8_" and -2 or 5) + 4 -- 牌的宽度
+    local card_width = self.card_width - (self._room.change_card_display == "8_" and 8 or 7) + 4 -- 牌的宽度
-
     local middle_x = self._area_handcard_list.width / 2
     local start_x = middle_x - (cards / 2 * (card_width))
     x = start_x + (card_width) * (cards_view.index_X - 1)

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

@@ -1,23 +1,15 @@
 {
   "objectStatus": {
-    "n131_ckvb": {
+    "n166_ukp7": {
-      "hidden": true,
+      "hidden": true
-      "collapsed": true
-    },
-    "n86_q50p": {
-      "collapsed": true
     },
     "n122_ckvb": {
-      "locked": true,
+      "locked": true
-      "collapsed": true
     },
     "n121_ckvb": {
       "locked": true,
       "collapsed": true
     },
-    "n166_ukp7": {
-      "hidden": true
-    },
     "n115_rnez": {
       "hidden": true
     },
@@ -33,8 +25,9 @@
     "n179_yffn": {
       "collapsed": true
     },
-    "n185_yffn": {
+    "n131_ckvb": {
-      "collapsed": true
+      "locked": true,
+      "hidden": true
     },
     "n87_q50p": {
       "hidden": true
@@ -48,9 +41,6 @@
     "n112_rnez": {
       "hidden": true,
       "collapsed": true
-    },
-    "n155_diqo": {
-      "collapsed": true
     }
   }
 }

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

@@ -1 +1,10 @@
-{}
+{
+  "objectStatus": {
+    "n25_ckvb": {
+      "collapsed": true
+    },
+    "n4_ckvb": {
+      "collapsed": true
+    }
+  }
+}

wb_new_ui/.objs/metas/lkq9ne9s/peuq4i.info

@@ -0,0 +1,7 @@
+{
+  "objectStatus": {
+    "n25_oynr": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/lkq9ne9s/peuq8b.info

@@ -1,18 +1,14 @@
 {
   "objectStatus": {
-    "n183_yfzf": {
+    "n36_k3io": {
-      "locked": true,
       "collapsed": true
     },
+    "n206_ib2w": {
+      "hidden": true
+    },
     "n154_r1mo": {
       "collapsed": true
     },
-    "n150_8th3": {
-      "collapsed": true
-    },
-    "n36_k3io": {
-      "collapsed": true
-    },
     "n163_o49p": {
       "collapsed": true
     }

wb_new_ui/.objs/metas/lkq9ne9s/peuqao.info

@@ -0,0 +1,19 @@
+{
+  "objectStatus": {
+    "n61_mk2u": {
+      "hidden": true
+    },
+    "n46_mk2u": {
+      "hidden": true
+    },
+    "n60_mk2u": {
+      "hidden": true
+    },
+    "n45_mk2u": {
+      "hidden": true
+    },
+    "n65_mk2u": {
+      "hidden": true
+    }
+  }
+}

wb_new_ui/.objs/metas/lkq9ne9s/peuqc6.info

@@ -0,0 +1 @@
+{}

wb_new_ui/.objs/workspace.json

@@ -3,16 +3,15 @@
   "libview.iconScale": 0,
   "doc.openedDocs": [
     "ui://lkq9ne9speuq8b",
-    "ui://lkq9ne9speuq6p",
+    "ui://lkq9ne9ssyh3rk",
-    "ui://lkq9ne9speuq6e",
+    "ui://lkq9ne9speuq3r",
-    "ui://lkq9ne9speuq6r",
+    "ui://lkq9ne9so0c1ru",
-    "ui://lkq9ne9speuq6g",
+    "ui://lkq9ne9speuq4i"
-    "ui://lkq9ne9speuq5a"
   ],
   "test.device": "Huawei Mate20",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://lkq9ne9speuq5a",
+  "doc.activeDoc": "ui://lkq9ne9speuq8b",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "lkq9ne9s",
@@ -20,9 +19,7 @@
     "lkq9ne9s",
     "/component/",
     "lkq9ne9s",
-    "/component/Main/",
+    "/component/Main/"
-    "lkq9ne9s",
-    "/component/Main/component/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Chat/Main.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1022,862" opaque="false">
-  <controller name="tab" pages="0,,1,,2," selected="1"/>
+  <controller name="tab" pages="0,,1,,2," selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n80_kmwu" name="n80" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="1022,862">
+    <component id="n80_kmwu" name="n80" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="1022,862" controller="bg_title,1">
-      <Button title="表情"/>
+      <Button title=" "/>
     </component>
-    <image id="n75_syh3" name="n75" src="cv577iox" fileName="images/bg_window_di.png" pkg="27vd145b" xy="0,0" size="1022,862" visible="false"/>
+    <image id="n75_syh3" name="n75" src="cv577iox" fileName="images/bg_window_di.png" pkg="27vd145b" xy="0,1" size="1022,862" visible="false"/>
     <component id="n58_h1uu" name="n58" src="eeqmcgu" fileName="Win_Frame_full.xml" pkg="27vd145b" xy="96,178" size="545,698" visible="false" controller="show_line,1,show_di,1,style,1">
       <gearXY controller="sdk" pages="0,1" values="96,178|268,0"/>
       <gearSize controller="sdk" pages="0,1" values="545,698,1,1|485,862,1,1"/>
       <relation target="" sidePair="width-width,height-height"/>
       <Button icon="ui://l0ds4ys6h1uu2"/>
     </component>
-    <image id="n76_syh3" name="n76" src="syh3ad" fileName="images/chat_minbg.png" xy="28,121"/>
+    <image id="n76_syh3" name="n76" src="syh3ad" fileName="images/chat_minbg.png" xy="27,121"/>
-    <list id="n52" name="lit_biaoqing1" xy="39,149" size="853,638" layout="flow_hz" lineGap="10" colGap="22" lineItemCount="6" defaultItem="ui://l0ds4ys6h1uu1v" renderOrder="descent">
+    <list id="n52" name="lit_biaoqing1" xy="36,149" size="853,638" layout="flow_hz" lineGap="10" colGap="22" lineItemCount="6" defaultItem="ui://l0ds4ys6h1uu1v" renderOrder="descent">
-      <gearDisplay controller="tab" pages="0"/>
+      <gearDisplay controller="tab" pages="1"/>
-      <gearXY controller="sdk" pages="0,1" values="39,149|302,58"/>
+      <gearXY controller="sdk" pages="0,1" values="36,149|302,58"/>
       <item icon="ui://l0ds4ys6h1uu6" name="101"/>
       <item icon="ui://l0ds4ys6h1uu7" name="102"/>
       <item icon="ui://l0ds4ys6h1uu8" name="103"/>
@@ -49,7 +49,7 @@
       <item icon="ui://l0ds4ys6h1uuz" name="130"/>
     </list>
     <list id="n53" name="lit_yuyin" xy="28,121" size="871,682" overflow="scroll" lineGap="10" defaultItem="ui://l0ds4ys6h1uu1t" autoItemSize="false">
-      <gearDisplay controller="tab" pages="1"/>
+      <gearDisplay controller="tab" pages="0"/>
       <item/>
       <item/>
       <item/>
@@ -62,18 +62,18 @@
       <item/>
       <item/>
     </list>
-    <component id="n77_syh3" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="903,-14"/>
+    <component id="n77_syh3" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="900,-14"/>
     <image id="n68_zgd9" name="n68" src="kxwjac" fileName="images/szsrk.png" xy="914,710" size="717,83" group="n70_zgd9"/>
     <text id="n71_zgd9" name="tex_chat" xy="936,711" size="669,83" group="n70_zgd9" visible="false" touchable="false" font="Microsoft YaHei" fontSize="36" color="#cfd3de" vAlign="middle" autoSize="none" bold="true" singleLine="true" autoClearText="true" text="发的发顺丰撒旦法" input="true" prompt="[color=#888888]输入内容[/color]" maxLength="20"/>
     <component id="n69_zgd9" name="btn_send" src="zgd92y" fileName="component/Button3.xml" xy="1644,708" size="182,110" group="n70_zgd9" visible="false" touchable="false"/>
     <group id="n70_zgd9" name="n70" xy="914,708" size="912,110" visible="false" advanced="true">
       <gearDisplay controller="sdk" pages="0"/>
     </group>
-    <component id="n78_kmwu" name="btn_tu" src="cv577inp" fileName="buttons/Btn_CheckBox.xml" pkg="27vd145b" xy="906,129" size="93,231">
+    <component id="n78_kmwu" name="btn_tu" src="cv577inp" fileName="buttons/Btn_CheckBox.xml" pkg="27vd145b" xy="907,387" size="93,231">
-      <Button icon="ui://l0ds4ys6kmwuai" selectedIcon="ui://l0ds4ys6kmwuah" controller="tab" page="0"/>
+      <Button icon="ui://l0ds4ys6kmwuai" selectedIcon="ui://l0ds4ys6kmwuah" controller="tab" page="1"/>
     </component>
-    <component id="n79_kmwu" name="btn_zi" src="cv577inp" fileName="buttons/Btn_CheckBox.xml" pkg="27vd145b" xy="906,367" size="93,231">
+    <component id="n79_kmwu" name="btn_zi" src="cv577inp" fileName="buttons/Btn_CheckBox.xml" pkg="27vd145b" xy="906,131" size="93,231">
-      <Button icon="ui://l0ds4ys6kmwuak" selectedIcon="ui://l0ds4ys6kmwuaj" controller="tab" page="1"/>
+      <Button checked="true" icon="ui://l0ds4ys6kmwuak" selectedIcon="ui://l0ds4ys6kmwuaj" controller="tab" page="0"/>
     </component>
   </displayList>
 </component>

wb_new_ui/assets/Common/GlobalModalWaiting.xml

@@ -1,14 +1,16 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <component size="1751,1001" extention="Button">
   <displayList>
-    <graph id="n1_lwcl" name="n1" xy="0,0" size="1751,1001" visible="false" type="rect" lineSize="0" fillColor="#0d000000" />
+    <graph id="n1_lwcl" name="n1" xy="0,0" size="1751,1001" visible="false" type="rect" lineSize="0" fillColor="#0d000000">
-    <component id="n4_9p4j" name="gcm_qiu" src="cjli6" fileName="UIPanel.xml" xy="872,465" size="1,1" />
+      <relation target="" sidePair="width-width,height-height"/>
-    <image id="n6_f86r" name="n6" src="f86rhxn" fileName="font/images/加载底(1).png" xy="396,442" size="897,117" group="n7_f86r" />
+    </graph>
-    <text id="n3_lwcl" name="title" xy="695,483" size="448,42" group="n7_f86r" fontSize="30" color="#ffffff" align="center" vAlign="middle" text="网络信号太差，正在检查网络中..." bold="true" />
+    <component id="n4_9p4j" name="gcm_qiu" src="cjli6" fileName="UIPanel.xml" xy="872,465" size="1,1"/>
-    <component id="n5_j1s2" name="n5" src="j4vkhxi" fileName="component/loading.xml" xy="603,450" group="n7_f86r" />
+    <image id="n6_f86r" name="n6" src="f86rhxn" fileName="font/images/加载底(1).png" xy="477,442" size="897,117" group="n7_f86r" scale="0.9,0.9"/>
-    <group id="n7_f86r" name="n7" xy="396,442" size="897,117" advanced="true">
+    <text id="n3_lwcl" name="title" xy="776,476" size="450,41" group="n7_f86r" scale="0.9,0.9" fontSize="30" color="#ffffff" align="center" vAlign="middle" bold="true" text="网络信号太差，正在检查网络中..."/>
-      <relation target="" sidePair="center-center,middle-middle" />
+    <component id="n5_j1s2" name="n5" src="j4vkhxi" fileName="component/loading.xml" xy="684,450" group="n7_f86r" scale="0.9,0.9"/>
+    <group id="n7_f86r" name="n7" xy="477,442" size="897,117" advanced="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
     </group>
   </displayList>
-  <Button />
+  <Button/>
 </component>

wb_new_ui/assets/Common/component/RightPanel.xml

@@ -3,13 +3,15 @@
   <controller name="xinhao" pages="0,,1," selected="0"/>
   <controller name="log" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n21_n6fs" name="n21" src="yffn7ip8" fileName="images/bg_game_top.png" xy="840,0" pivot="0.5,0.5" size="851,115"/>
+    <image id="n21_n6fs" name="n21" src="yffn7ip8" fileName="images/bg_game_top.png" xy="840,0" pivot="0.5,0.5" size="851,115">
+      <relation target="" sidePair="width-width%"/>
+    </image>
     <component id="n20_qpk6" name="btn_log" src="yffnfz" fileName="component/phone_info/Btn_log.xml" pkg="8wph7p8n" xy="556,14" visible="false" touchable="false"/>
     <component id="n1" name="btn_setting" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" xy="268,15" size="64,106">
       <Button icon="ui://27vd145byffn7ip4"/>
     </component>
     <component id="n5" name="pb_batteryLevel" src="yffng3" fileName="component/ProgressBar2.xml" xy="866,30" scale="2,2" touchable="false">
-      <relation target="" sidePair="left-left"/>
+      <relation target="" sidePair="left-left%,top-top%"/>
       <ProgressBar value="62" max="100"/>
     </component>
     <component id="n6" name="gcm_xinhao" src="yffng4" fileName="component/Component3(1).xml" xy="1408,12" size="82,22" scale="1.8,1.8" visible="false" touchable="false">
@@ -19,8 +21,8 @@
       <gearDisplay controller="xinhao" pages="1"/>
     </component>
     <text id="n7" name="tex_data" xy="320,30" size="212,49" visible="false" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" text="2017-07-09"/>
-    <text id="n12_yyhx" name="tex_time" xy="942,15" size="122,62" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="13:00">
+    <text id="n12_yyhx" name="tex_time" xy="942,17" size="122,61" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="13:00">
-      <relation target="" sidePair="left-left"/>
+      <relation target="" sidePair="left-left%,top-top%"/>
     </text>
   </displayList>
 </component>

wb_new_ui/assets/Common/component/RoomInfoPanel1.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="310,61" initName="roominfo_panel">
+<component size="280,62" initName="roominfo_panel">
   <displayList>
-    <text id="n1_h1uu" name="n1" xy="9,0" size="107,62" group="n5_qpk6" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="房号:"/>
+    <text id="n1_h1uu" name="n1" xy="9,0" size="107,61" group="n5_qpk6" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="房号:"/>
-    <text id="n2_h1uu" name="tex_roomid" xy="116,0" size="191,62" group="n5_qpk6" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="2345672"/>
+    <text id="n2_h1uu" name="tex_roomid" xy="116,0" size="164,61" group="n5_qpk6" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="123456"/>
     <text id="n3_h1uu" name="tex_gametype" xy="89,28" size="134,33" group="n5_qpk6" visible="false" fontSize="25" color="#ffffff" autoSize="none" bold="true" text="湘乡告胡子                 "/>
     <text id="n4_h1uu" name="tex_roomconfig" xy="204,6" size="10,9" group="n5_qpk6" visible="false" fontSize="1" color="#ffffff" autoSize="none" bold="true" text="                                 "/>
     <text id="n7_f2pr" name="tex_beishu" xy="0,0" size="65,41" group="n5_qpk6" visible="false" fontSize="28" color="#b93f05" vAlign="middle" autoSize="shrink" bold="true" text="500倍"/>
-    <group id="n5_qpk6" name="n5" xy="0,0" size="307,62"/>
+    <group id="n5_qpk6" name="n5" xy="0,0" size="280,62"/>
   </displayList>
 </component>

wb_new_ui/assets/Common/component/Win_BaseWindow.xml

@@ -1,20 +1,22 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <component size="1500,930" extention="Button">
-  <controller name="bianhui" pages="0,,1," selected="0" />
+  <controller name="bianhui" exported="true" pages="0,,1," selected="0"/>
+  <controller name="bg_title" exported="true" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n5_ik9v" name="n5" src="ik9v7imc" fileName="images/bg_window.png" xy="-1,0" size="1500,930">
-      <relation target="" sidePair="width-width,height-height" />
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n7_zmrw" name="n7" src="ik9v7imd" fileName="images/bg_windowTitle.png" xy="371,-6">
-      <gearLook controller="bianhui" pages="1" values="1,0,1,0" default="1,0,0,0" />
+      <gearDisplay controller="bg_title" pages="0"/>
-      <relation target="" sidePair="center-center" />
+      <gearLook controller="bianhui" pages="1" values="1,0,1,0" default="1,0,0,0"/>
+      <relation target="" sidePair="center-center"/>
     </image>
     <loader id="n4_hz87" name="icon" xy="371,-6" size="757,125" fill="scaleFree" clearOnPublish="true">
-      <relation target="" sidePair="center-center" />
+      <relation target="" sidePair="center-center"/>
     </loader>
-    <text id="n6_ik9v" name="title" xy="662,4" pivot="0.5,0.5" size="176,98" font="ui://27vd145bik9v7imb" fontSize="94" align="center" vAlign="middle" autoClearText="true" text="战况" bold="true">
+    <text id="n6_ik9v" name="title" xy="662,4" pivot="0.5,0.5" size="176,98" font="ui://27vd145bik9v7imb" fontSize="94" align="center" vAlign="middle" bold="true" autoClearText="true" text="战况">
-      <relation target="" sidePair="center-center" />
+      <relation target="" sidePair="center-center"/>
     </text>
   </displayList>
-  <Button />
+  <Button/>
 </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,328" opaque="false" initName="player_card_info">
   <controller name="output" pages="0,,1,,2," selected="0"/>
-  <controller name="out_card_option" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
+  <controller name="out_card_option" homePageType="specific" homePage="1" pages="0,,1,,2," selected="1"/>
   <controller name="put_error" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1,,2,,3," selected="0"/>
   <controller name="piao_value" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
@@ -103,14 +103,14 @@
       <item/>
       <item/>
     </list>
-    <component id="n74_ckvb" name="Btn_SendCard" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1192,-223" size="400,169" group="n73_ckvb" touchable="false" grayed="true">
+    <component id="n74_ckvb" name="Btn_SendCard" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1192,-263" size="400,169" group="n73_ckvb" touchable="false" grayed="true">
       <gearLook controller="canSendCard" pages="0" values="1,0,1,0" default="1,0,0,1"/>
       <Button icon="ui://27vd145byffn7ipa" sound=""/>
     </component>
-    <component id="n75_ckvb" name="Btn_Tip" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="722,-223" size="400,169" group="n73_ckvb">
+    <component id="n75_ckvb" name="Btn_Tip" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="722,-263" size="400,169" group="n73_ckvb">
       <Button icon="ui://27vd145byffn7ipg" sound=""/>
     </component>
-    <group id="n73_ckvb" name="btn" xy="722,-223" size="870,169" advanced="true">
+    <group id="n73_ckvb" name="btn" xy="722,-263" size="870,169" advanced="true">
       <gearDisplay controller="out_card_option" pages="1,2"/>
     </group>
     <text id="n56_dg1i" name="put_error" xy="717,-276" size="781,83" fontSize="50" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" shadowColor="#000000" shadowOffset="1,1" text="出牌不符合规定牌型">

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始,3,打鸟" selected="0"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
@@ -11,7 +11,7 @@
   <controller name="witness" pages="0,,1," selected="0"/>
   <controller name="check" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n141_ckvb" name="bg_mask" xy="6,8" size="2532,751" type="rect" lineSize="0" fillColor="#00ffffff"/>
+    <graph id="n141_ckvb" name="bg_mask" xy="6,9" size="2532,751" type="rect" lineSize="0" fillColor="#00ffffff"/>
     <component id="n76_rqeb" name="mask" src="yffniy" fileName="component/mask.xml" xy="14,1956" alpha="0">
       <gearDisplay controller="state" pages="1"/>
       <gearLook controller="state" pages="0,2,3" values="0,0,0,1|0,0,0,1|0,0,0,1" default="0,0,0,1"/>
@@ -47,11 +47,11 @@
       <gearDisplay controller="time" pages="1,2,3"/>
       <gearXY controller="time" pages="1,2" values="-296,2199|2797,1976" default="625,198"/>
     </component>
-    <component id="n182_yffn" name="btn_ready" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="766,620" size="400,169" group="n185_yffn">
+    <component id="n182_yffn" name="btn_ready" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="716,620" size="400,169" group="n185_yffn">
       <gearDisplay controller="action" pages="0,1"/>
       <Button icon="ui://27vd145byffn7ipc"/>
     </component>
-    <component id="n184_yffn" name="btn_xipai" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1366,620" size="400,169" group="n185_yffn">
+    <component id="n184_yffn" name="btn_xipai" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1416,620" size="400,169" group="n185_yffn">
       <gearDisplay controller="action" pages="0,1"/>
       <Button icon="ui://27vd145byffn7iq2"/>
     </component>
@@ -59,7 +59,7 @@
       <gearDisplay controller="action" pages="0"/>
       <Button icon="ui://27vd145byffn7iq2"/>
     </component>
-    <group id="n185_yffn" name="btn_rendy" xy="766,620" size="1000,178" advanced="true">
+    <group id="n185_yffn" name="btn_rendy" xy="716,620" size="1100,178" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>
@@ -67,27 +67,25 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </text>
-    <component id="n79_roef" name="btn_distance" src="yffnj3" fileName="component/gps/btn_distance_new.xml" xy="1729,1848" visible="false" touchable="false">
+    <component id="n79_roef" name="btn_distance" src="yffnj3" fileName="component/gps/btn_distance_new.xml" xy="1727,1848" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n86_q50p" sidePair="right-right"/>
     </component>
-    <component id="n181_yffn" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" pkg="27vd145b" xy="0,0" group="n86_q50p"/>
+    <component id="n181_yffn" name="right_panel" src="yffnj6" fileName="component/RightPanel.xml" pkg="27vd145b" xy="-2,-1" group="n86_q50p"/>
-    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="1099,13" group="n86_q50p" touchable="false">
+    <component id="n83_q50p" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="1126,15" pivot="0.5,0.5" group="n86_q50p" touchable="false"/>
-      <relation target="" sidePair="center-center"/>
+    <component id="n84_q50p" name="btn_back_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="614,15" size="64,106" group="n86_q50p">
-    </component>
-    <component id="n84_q50p" name="btn_back_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="616,15" size="64,106" group="n86_q50p">
       <gearDisplay controller="state" pages="0,1,2,3"/>
       <Button icon="ui://27vd145byffn7ip2"/>
     </component>
-    <component id="n85_q50p" name="btn_rule" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="405,15" size="129,106" group="n86_q50p">
+    <component id="n85_q50p" name="btn_rule" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="403,15" size="129,106" group="n86_q50p">
       <Button icon="ui://27vd145byffn7ip5"/>
     </component>
-    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="784,131" size="995,0" group="n86_q50p" scale="1.5,1.5" visible="false" touchable="false"/>
+    <component id="n87_q50p" name="roominfo_panel" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="782,131" size="995,0" group="n86_q50p" scale="1.5,1.5" visible="false" touchable="false"/>
-    <component id="n120_r1z9" name="btn_leave_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="764,15" size="71,106" group="n86_q50p">
+    <component id="n120_r1z9" name="btn_leave_lobby" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="762,15" size="71,106" group="n86_q50p">
       <gearDisplay controller="state" pages="0,3"/>
       <Button icon="ui://27vd145byffn7ip3"/>
     </component>
-    <group id="n86_q50p" name="n86" xy="0,0" size="2532,131" advanced="true">
+    <group id="n86_q50p" name="n86" xy="-2,-1" size="2532,132" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n75_jmab" name="poker_eff" src="yffnbi" fileName="component/effect/poker/poker_eff.xml" xy="618,10" touchable="false">
@@ -154,15 +152,12 @@
       <gearDisplay controller="time" pages="1,2,3"/>
       <gearXY controller="time" pages="1,2" values="729,667|2133,159" default="388,492"/>
     </component>
-    <text id="n135_ckvb" name="Text_CurrenRound" xy="1461,13" size="32,64" group="n155_diqo" font="Microsoft YaHei" fontSize="48" color="#ffffff" singleLine="true" text="0">
+    <text id="n135_ckvb" name="Text_CurrenRound" xy="1491,14" size="32,64" group="n155_diqo" font="Microsoft YaHei" fontSize="48" color="#ffffff" singleLine="true" text="0">
-      <relation target="" sidePair="top-top"/>
       <relation target="n136_ckvb" sidePair="right-left"/>
     </text>
-    <text id="n136_ckvb" name="Text_MaxMaxRound" xy="1491,12" size="135,64" group="n155_diqo" font="Microsoft YaHei" fontSize="48" color="#ffffff" letterSpacing="2" singleLine="true" text="/10局">
+    <text id="n136_ckvb" name="Text_MaxMaxRound" xy="1521,13" size="135,64" group="n155_diqo" font="Microsoft YaHei" fontSize="48" color="#ffffff" letterSpacing="2" singleLine="true" text="/10局"/>
-      <relation target="" sidePair="top-top"/>
+    <group id="n155_diqo" name="n155" xy="1491,13" size="165,65" advanced="true">
-    </text>
+      <relation target="" sidePair="left-right%,top-top"/>
-    <group id="n155_diqo" name="n155" xy="1461,12" size="165,65" advanced="true">
-      <relation target="n134_ckvb" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n130_ckvb" name="btn_pangGuang" src="yffn21" fileName="Main_New/Component/Btn_Spectator.xml" xy="597,23" size="90,76" group="n131_ckvb">
       <relation target="" sidePair="right-center%,top-top"/>
@@ -223,7 +218,7 @@
     </component>
     <component id="n172_ukp7" name="comp_witness" src="yffn30" fileName="Main_New/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="0.5"/>
+      <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration=".5"/>
     </component>
     <component id="n187_qcrm" name="panel_record" src="qcrmcjs" fileName="Main_style_2/record/Record.xml" xy="967,457" size="757,165" group="n189_qcrm" alpha="0.5">
       <gearDisplay controller="state" pages="3"/>
@@ -245,7 +240,7 @@
       <gearDisplay controller="state" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="component/Gcm_chat.xml" pkg="27vd145b" xy="2388,313">
+    <component id="n77_ij2y" name="gcm_chat" src="yffnjo" fileName="component/Gcm_chat.xml" pkg="27vd145b" xy="2388,426">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
   </displayList>

wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml

@@ -6,7 +6,7 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <displayList>
     <text id="n93_nkur" name="wanfa_text" xy="2,1" size="156,51" font="Microsoft YaHei" fontSize="38" color="#ffffff" vAlign="middle" text="玩法介绍"/>
-    <text id="n116_u50h" name="text_playName" xy="1113,413" pivot="0.5,0" size="305,124" font="ui://27vd145bu50h7j1a" fontSize="120" autoClearText="true" text="1红中">
+    <text id="n116_u50h" name="text_playName" xy="1113,523" pivot="0.5,0.5" size="305,124" font="ui://27vd145bu50h7j1a" fontSize="120" autoClearText="true" text="1红中">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <text id="n75_l2u4" name="n11" xy="1254,543" size="76,49" group="n80_l2u4" fontSize="36" color="#c2ffe0" vAlign="middle" bold="true" text="剩余">
@@ -38,7 +38,7 @@
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
-    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="2087,-4" visible="false" touchable="false">
+    <component id="n91_8sat" name="btn_distance" src="gq7m40" fileName="Main_style_2/gps/btn_distance_new.xml" xy="2085,-4" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n90_8sat" sidePair="right-right"/>
     </component>
@@ -80,12 +80,8 @@
     <component id="n56_cnxs" name="mask_tips" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="0,161" size="2532,1170" touchable="false">
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n71_l2u4" name="com_roominfo" src="yffnj6" fileName="component/RightPanel.xml" pkg="27vd145b" xy="0,0" group="n90_8sat">
+    <component id="n71_l2u4" name="com_roominfo" src="yffnj6" fileName="component/RightPanel.xml" pkg="27vd145b" xy="-2,-1" group="n90_8sat"/>
-      <relation target="" sidePair="width-width"/>
+    <component id="n86_8sat" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="1126,15" group="n90_8sat" touchable="false"/>
-    </component>
-    <component id="n86_8sat" name="roominfo_panel1" src="yffnj9" fileName="component/RoomInfoPanel1.xml" pkg="27vd145b" xy="1109,15" group="n90_8sat" touchable="false">
-      <relation target="" sidePair="center-center,top-top"/>
-    </component>
     <component id="n88_8sat" name="btn_rule" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="405,10" size="129,106" group="n90_8sat">
       <Button icon="ui://27vd145byffn7ip5"/>
     </component>
@@ -101,10 +97,10 @@
       <gearDisplay controller="state" pages="0,3"/>
       <Button icon="ui://27vd145byffn7ip3"/>
     </component>
-    <group id="n90_8sat" name="n90" xy="0,0" size="2532,121" advanced="true">
+    <group id="n90_8sat" name="n90" xy="-2,-1" size="2532,122" advanced="true">
-      <relation target="" sidePair="center-center,top-top"/>
+      <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n69_l2u4" name="gcm_chat" src="yffnjo" fileName="component/Gcm_chat.xml" pkg="27vd145b" xy="2368,333">
+    <component id="n69_l2u4" name="gcm_chat" src="yffnjo" fileName="component/Gcm_chat.xml" pkg="27vd145b" xy="2368,416">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
@@ -133,13 +129,13 @@
     <group id="n100_dnw9" name="n100" xy="5,109" size="1282,331" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <text id="n72_l2u4" name="n21" xy="1443,15" size="50,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="第"/>
+    <text id="n72_l2u4" name="n21" xy="1452,15" size="50,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="第"/>
-    <text id="n73_l2u4" name="n22" xy="1533,15" size="23,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="/"/>
+    <text id="n73_l2u4" name="n22" xy="1542,15" size="23,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="/"/>
-    <text id="n74_l2u4" name="n23" xy="1600,15" size="50,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="局"/>
+    <text id="n74_l2u4" name="n23" xy="1609,15" size="50,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" text="局"/>
-    <text id="n78_l2u4" name="tex_round1" xy="1497,15" size="31,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" align="center" vAlign="middle" autoClearText="true" text="2"/>
+    <text id="n78_l2u4" name="tex_round1" xy="1506,15" size="31,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" align="center" vAlign="middle" autoClearText="true" text="2"/>
-    <text id="n79_l2u4" name="tex_round2" xy="1562,15" size="31,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" align="center" vAlign="middle" autoClearText="true" text="8"/>
+    <text id="n79_l2u4" name="tex_round2" xy="1571,15" size="31,61" group="n117_kmwu" font="Microsoft YaHei" fontSize="46" color="#ffffff" align="center" vAlign="middle" autoClearText="true" text="8"/>
-    <group id="n117_kmwu" name="n117" xy="1443,15" size="207,62" advanced="true">
+    <group id="n117_kmwu" name="n117" xy="1452,15" size="207,62" advanced="true">
-      <relation target="n86_8sat" sidePair="left-right"/>
+      <relation target="" sidePair="right-right%"/>
     </group>
   </displayList>
 </component>

wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1172" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="3"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="jushu" pages="0,,1," selected="0"/>
@@ -47,8 +47,8 @@
     <component id="n147_nu0l" name="player_info2" src="peuq6r" fileName="component/Main/component/PlayerHead_2.xml" xy="63,54" size="200,300">
       <relation target="" sidePair="rightext-left,topext-top,bottomext-top,leftext-left"/>
     </component>
-    <component id="n194_syh3" name="gcm_chat" src="syh3rk" fileName="component/Main/Main_2_chat.xml" xy="2380,553"/>
+    <component id="n194_syh3" name="gcm_chat" src="syh3rk" fileName="component/Main/Main_2_chat.xml" xy="2380,376" visible="false"/>
-    <component id="n7" name="player_info1" src="peuq6e" fileName="component/Main/component/PlayerHead_1.xml" xy="48,570" size="200,300">
+    <component id="n7" name="player_info1" src="peuq6e" fileName="component/Main/component/PlayerHead_1.xml" xy="69,602" size="200,300">
       <gearXY controller="state" pages="0,1,2,3" values="69,602|49,707|54,675|48,570"/>
       <relation target="" sidePair="rightext-left,topext-bottom%,bottomext-bottom,leftext-left"/>
     </component>
@@ -73,7 +73,7 @@
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n58_zzcq" name="tex_version" xy="954,49" size="130,49" font="Microsoft YaHei" fontSize="34" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="v2.0.0">
+    <text id="n58_zzcq" name="tex_version" xy="954,26" size="130,49" font="Microsoft YaHei" fontSize="34" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="v2.0.0">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="rightext-left,topext-top,bottomext-top,leftext-left"/>
     </text>
@@ -111,22 +111,25 @@
     <component id="n179_kxwj" name="btn_distance" src="peuq94" fileName="component/gps/btn_distance_new.xml" xy="1800,13" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
+    <graph id="n206_ib2w" name="safe_close" xy="0,0" size="2532,1172" type="rect" lineSize="0" fillColor="#40000000">
+      <relation target="" sidePair="width-width,height-height"/>
+    </graph>
     <component id="n198_h5b1" name="safe_bg" src="o0c1ru" fileName="component/Main/main_2_safe_bg.xml" xy="2335,0" size="200,1170"/>
     <component id="n193_syh3" name="btn_safe" src="syh3rj" fileName="component/Main/btn_safe.xml" xy="2383,19" size="109,109"/>
-    <component id="n201_o0c1" name="btn_rule" src="o0c1rv" fileName="component/Main/component/Folder/component/phone_info/Btn_rule.xml" xy="1896,27" group="n183_yfzf"/>
+    <component id="n201_o0c1" name="btn_rule" src="o0c1rv" fileName="component/Main/component/Folder/component/phone_info/Btn_rule.xml" xy="2383,201" group="n183_yfzf" visible="false"/>
-    <component id="n166_o49p" name="btn_back_lobby" src="peuq3r" fileName="component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml" xy="2381,201" size="109,109" group="n183_yfzf">
+    <component id="n166_o49p" name="btn_back_lobby" src="peuq3r" fileName="component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml" xy="2296,201" group="n183_yfzf">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <component id="n167_o49p" name="Btn_jiesan_lobby" src="peuq3z" fileName="component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml" xy="2380,202" size="109,109" group="n183_yfzf">
+    <component id="n167_o49p" name="Btn_jiesan_lobby" src="peuq3z" fileName="component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml" xy="2296,202" group="n183_yfzf">
       <gearDisplay controller="state" pages="1,2"/>
     </component>
-    <component id="n181_r1z9" name="btn_leave_lobby" src="peuq45" fileName="component/Main/component/Folder/component/phone_info/Btn_leave_lobby.xml" xy="2381,542" size="109,109" group="n183_yfzf">
+    <component id="n181_r1z9" name="btn_leave_lobby" src="peuq45" fileName="component/Main/component/Folder/component/phone_info/Btn_leave_lobby.xml" xy="2296,542" group="n183_yfzf">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <component id="n168_o49p" name="btn_setting" src="peuq3c" fileName="component/Main/component/Folder/component/phone_info/Btn_setting.xml" xy="2383,380" size="109,109" group="n183_yfzf">
+    <component id="n168_o49p" name="btn_setting" src="peuq3c" fileName="component/Main/component/Folder/component/phone_info/Btn_setting.xml" xy="2216,380" group="n183_yfzf">
       <gearDisplay controller="state" pages="0,1,2"/>
     </component>
-    <group id="n183_yfzf" name="n183" xy="1896,27" size="596,624" advanced="true">
+    <group id="n183_yfzf" name="n183" xy="2216,201" size="276,450" advanced="true">
       <relation target="" sidePair=""/>
     </group>
   </displayList>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/RightPanel.xml

@@ -11,7 +11,7 @@
     <component id="n5" name="pb_batteryLevel" src="peuq3g" fileName="component/Main/component/Folder/component/phone_info/ProgressBar2.xml" xy="9,14" size="62,15" group="n19_qpk6" scale="2,2" touchable="false">
       <ProgressBar value="62" max="100"/>
     </component>
-    <component id="n25_oynr" name="gcm_xinhao" src="peuq41" fileName="component/Main/component/Folder/component/phone_info/Component3(1).xml" xy="107,13" size="103,38" group="n19_qpk6" scale="1.5,1.5" touchable="false"/>
+    <component id="n25_oynr" name="gcm_xinhao" src="peuq41" fileName="component/Main/component/Folder/component/phone_info/Component3(1).xml" xy="107,13" size="103,38" group="n19_qpk6" scale="1.5,1.5" visible="false" touchable="false"/>
     <component id="n9" name="gcm_wifi" src="peuq3j" fileName="component/Main/component/Folder/component/phone_info/Component3.xml" xy="317,-3" size="55,20" group="n19_qpk6" aspect="true" visible="false" touchable="false">
       <gearDisplay controller="xinhao" pages="1"/>
     </component>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="109,109" extention="Button" initName="btn_back_lobby">
+<component size="196,109" extention="Button" initName="btn_back_lobby">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n3_hp0b" name="n3" src="peuq3s" fileName="component/Main/component/Folder/images/phone_info/game_icon_01.png" xy="5,0" pivot="0.5,0.5" size="50,48" aspect="true" visible="false"/>
     <text id="n4_8th3" name="n4" xy="0,55" size="59,34" visible="false" fontSize="20" color="#ffffff" align="center" autoSize="none" text="返回"/>
     <image id="n5_mk2u" name="n5" src="peuq3t" fileName="component/Main/component/Folder/component/phone_info/new_lk.png" xy="6,10" visible="false"/>
     <image id="n7_o49p" name="n7" src="peuq3u" fileName="component/Main/component/new_ui/jiesan_img.png" xy="0,16" visible="false"/>
-    <image id="n8_syh3" name="n8" src="syh3rd" fileName="image/main_2/game_exit.png" xy="0,0"/>
+    <image id="n8_syh3" name="n8" src="ib2ws3" fileName="image/main_2/zipaigame_jiesan.png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/component/phone_info/Btn_jiesan_lobby.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="109,109" extention="Button" initName="btn_back_lobby">
+<component size="196,109" extention="Button" initName="btn_back_lobby">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n3_hp0b" name="n3" src="peuq40" fileName="component/Main/component/Folder/component/phone_info/game_icon_01.png" xy="5,0" pivot="0.5,0.5" size="50,48" aspect="true" visible="false"/>
     <text id="n4_8th3" name="n4" xy="0,55" size="59,34" visible="false" fontSize="20" color="#ffffff" align="center" autoSize="none" text="解散"/>
     <image id="n6_oynr" name="n6" src="peuq3y" fileName="component/Main/component/Folder/component/phone_info/new_js.png" xy="7,9" visible="false"/>
     <image id="n8_o49p" name="n8" src="peuq3u" fileName="component/Main/component/new_ui/jiesan_img.png" xy="0,16" visible="false"/>
-    <image id="n9_syh3" name="n9" src="syh3rd" fileName="image/main_2/game_exit.png" xy="0,0"/>
+    <image id="n9_syh3" name="n9" src="ib2ws3" fileName="image/main_2/zipaigame_jiesan.png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/component/phone_info/Btn_leave_lobby.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="109,109" extention="Button" initName="btn_back_lobby">
+<component size="196,109" extention="Button" initName="btn_back_lobby">
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n3_hp0b" name="n3" src="peuq46" fileName="images/lk.png" xy="0,0" pivot="0.5,0.5" aspect="true" visible="false"/>
-    <image id="n4_syh3" name="n4" src="syh3rh" fileName="image/main_2/game_back.png" xy="0,0"/>
+    <image id="n4_syh3" name="n4" src="ib2ws5" fileName="image/main_2/zipaigame_leave.png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_RunBeard/component/Main/component/Folder/component/phone_info/Btn_setting.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="109,109" extention="Button">
+<component size="276,109" extention="Button">
   <displayList>
     <image id="n1" name="n1" src="peuq3d" fileName="component/Main/component/Folder/images/phone_info/shezhi.png" xy="10,0" pivot="0.5,0.5" size="50,50" aspect="true" visible="false"/>
     <text id="n2_8th3" name="n2" xy="5,55" size="59,34" visible="false" fontSize="20" color="#ffffff" align="center" autoSize="none" text="设置"/>
     <image id="n3_mk2u" name="n3" src="peuq3e" fileName="component/Main/component/Folder/component/phone_info/new_sz.png" xy="12,10" visible="false"/>
     <image id="n5_o49p" name="n5" src="peuq3f" fileName="component/Main/component/new_ui/shezhi_img.png" xy="6,14" visible="false"/>
-    <image id="n7_syh3" name="n7" src="syh3rg" fileName="image/main_2/game_setting.png" xy="0,0"/>
+    <image id="n7_syh3" name="n7" src="ib2ws4" fileName="image/main_2/zipaigame_setting.png" xy="0,0"/>
   </displayList>
   <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_RunBeard/component/Main/component/fztip.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170"/>

wb_new_ui/assets/Main_RunBeard/component/option/component/card/Btn_Card.xml

@@ -3,7 +3,7 @@
   <controller name="button" pages="0,up,1,down" selected="0"/>
   <controller name="Kan" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="0,1" size="83,90" url="ui://v6yvqp7wlr5dg" fill="scale">
+    <loader id="n3_hp0b" name="icon" xy="0,1" size="83,90" url="ui://v6yvqp7wlr5dg" fill="scaleFree">
       <gearXY controller="button" pages="0,1" values="0,1|-3,-22" tween="true"/>
     </loader>
     <graph id="n4_m25s" name="n4" xy="-3,1" size="87,104" type="rect" lineColor="#ff333333" fillColor="#c2333333" corner="5">

wb_new_ui/assets/Main_RunBeard/component/setting/component/setting/Btn_cr_checkbox.xml

@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="123,47" extention="Button" remark="123">
-  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <controller name="button" pages="0,up,1,down" selected="0"/>
   <displayList>
     <image id="n6" name="n6" src="peuqab" fileName="component/create_room/image/pic08.png" xy="0,0" visible="false">
       <gearDisplay controller="button" pages="0,1,2,3"/>
     </image>
     <image id="n11_a46z" name="n11" src="peuqac" fileName="component/setting/images/newsetting/ydk_aimg.png" xy="4,4">
       <gearDisplay controller="button" pages="0,1"/>
+      <relation target="" sidePair="middle-middle"/>
     </image>
     <image id="n7" name="n7" src="peuqad" fileName="component/create_room/image/pic09.png" xy="-1,-2" visible="false">
       <gearDisplay controller="button" pages="1,3"/>
     </image>
     <image id="n9_a46z" name="n9" src="peuqae" fileName="component/setting/images/newsetting/hd_img.png" xy="7,8">
       <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="middle-middle"/>
     </image>
-    <text id="n8" name="title" xy="49,6" size="10,37" fontSize="28" color="#dc420f" vAlign="middle" bold="true" text="">
+    <text id="n8" name="title" xy="49,6" size="10,37" fontSize="28" color="#5c3c16" vAlign="middle" bold="true" text="">
       <gearColor controller="button" pages="0,1" values="#5c3c16,#000000|#dc420f,#000000"/>
     </text>
   </displayList>

wb_new_ui/assets/Main_RunBeard/component/setting/images/newsetting/Component5.xml

@@ -38,35 +38,35 @@
       <Slider value="100" max="100"/>
     </component>
     <group id="n41_mk2u" name="n41" xy="33,229" size="1059,167" group="n58_mk2u" advanced="true"/>
-    <image id="n44_mk2u" name="n44" src="peuq87" fileName="component/Main/setting/images/setting/zipai_font_01.png" xy="265,807" size="72,90" group="n50_mk2u"/>
+    <image id="n44_mk2u" name="n44" src="peuq87" fileName="component/Main/setting/images/setting/zipai_font_01.png" xy="284,799" group="n50_mk2u"/>
-    <image id="n45_mk2u" name="n45" src="peuq88" fileName="component/Main/setting/images/setting/zipai_font_02.png" xy="513,806" size="72,91" group="n50_mk2u" visible="false"/>
+    <image id="n45_mk2u" name="n45" src="peuq88" fileName="component/Main/setting/images/setting/zipai_font_02.png" xy="384,806" size="72,91" group="n50_mk2u" visible="false"/>
-    <image id="n46_mk2u" name="n46" src="peuq89" fileName="component/Main/setting/images/setting/zipai_font_03.png" xy="315,926" size="71,89" group="n50_mk2u" visible="false"/>
+    <image id="n46_mk2u" name="n46" src="peuq89" fileName="component/Main/setting/images/setting/zipai_font_03.png" xy="186,926" size="71,89" group="n50_mk2u" visible="false"/>
-    <image id="n47_mk2u" name="n47" src="peuq8a" fileName="component/Main/setting/images/setting/zipai_font_04.png" xy="498,809" size="68,88" group="n50_mk2u"/>
+    <image id="n47_mk2u" name="n47" src="peuq8a" fileName="component/Main/setting/images/setting/zipai_font_04.png" xy="637,799" group="n50_mk2u"/>
-    <component id="n59_mk2u" name="n59" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="343,830" size="123,47" group="n50_mk2u">
+    <component id="n59_mk2u" name="n59" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="218,800" size="163,110" group="n50_mk2u">
       <Button checked="true" controller="cards" page="0"/>
     </component>
-    <component id="n60_mk2u" name="n60" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="598,830" size="71,47" group="n50_mk2u" visible="false">
+    <component id="n60_mk2u" name="n60" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="469,830" size="71,47" group="n50_mk2u" visible="false">
       <Button controller="cards" page="1"/>
     </component>
-    <component id="n61_mk2u" name="n61" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="393,949" size="69,47" group="n50_mk2u" visible="false">
+    <component id="n61_mk2u" name="n61" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="264,949" size="69,47" group="n50_mk2u" visible="false">
       <Button controller="cards" page="2"/>
     </component>
-    <component id="n62_mk2u" name="n62" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="570,826" size="123,47" group="n50_mk2u">
+    <component id="n62_mk2u" name="n62" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="567,801" size="169,110" group="n50_mk2u">
       <Button controller="cards" page="3"/>
     </component>
-    <group id="n50_mk2u" name="n50" xy="265,806" size="427,209" group="n58_mk2u" advanced="true">
+    <group id="n50_mk2u" name="n50" xy="186,799" size="550,216" group="n58_mk2u" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n66_mk2u" name="n66" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="294,1060" size="123,47" group="n54_mk2u">
+    <component id="n66_mk2u" name="n66" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="217,1060" size="123,47" group="n54_mk2u">
       <Button checked="true" title="大" titleColor="#5c3c16" titleFontSize="34" controller="size" page="0"/>
     </component>
-    <component id="n64_mk2u" name="n64" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="520,1060" size="123,47" group="n54_mk2u">
+    <component id="n64_mk2u" name="n64" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="570,1060" size="123,47" group="n54_mk2u">
       <Button title="中" titleColor="#5c3c16" titleFontSize="34" controller="size" page="1"/>
     </component>
-    <component id="n65_mk2u" name="n65" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="565,1060" size="123,47" group="n54_mk2u" visible="false">
+    <component id="n65_mk2u" name="n65" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="500,1059" size="123,47" group="n54_mk2u" visible="false">
       <Button title="小" titleColor="#5c3c16" titleFontSize="35" controller="size" page="2"/>
     </component>
-    <group id="n54_mk2u" name="n54" xy="294,1060" size="394,47" group="n58_mk2u" advanced="true">
+    <group id="n54_mk2u" name="n54" xy="217,1059" size="476,48" group="n58_mk2u" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n67_mk2u" name="n67" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1149,622" size="214,57" group="n57_mk2u">
@@ -84,7 +84,7 @@
     <component id="n74_ra9v" name="n74" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1495,1111" size="123,47" group="n76_ra9v">
       <Button title="是" titleColor="#624720" titleFontSize="34" controller="yuyin" page="1"/>
     </component>
-    <text id="n75_ra9v" name="n75" xy="1110,1111" size="208,46" group="n76_ra9v" fontSize="34" color="#5c3c16" text="禁止接收语音"/>
+    <text id="n75_ra9v" name="n75" xy="1110,1111" size="208,47" group="n76_ra9v" fontSize="34" color="#5c3c16" text="禁止接收语音"/>
     <group id="n76_ra9v" name="n76" xy="1110,1111" size="507,47" group="n78_ra9v"/>
     <component id="n70_ra9v" name="n70" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1373,1045" size="123,47" group="n77_ra9v">
       <Button checked="true" title="否" titleColor="#5c3c16" titleFontSize="34" controller="chupai" page="0"/>
@@ -92,21 +92,21 @@
     <component id="n71_ra9v" name="n71" src="peuqaa" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1495,1045" size="123,47" group="n77_ra9v">
       <Button title="是" titleColor="#5c3c16" titleFontSize="34" controller="chupai" page="1"/>
     </component>
-    <text id="n72_ra9v" name="n72" xy="1110,1049" size="208,46" group="n77_ra9v" fontSize="34" color="#5c3c16" text="开启快速吃牌"/>
+    <text id="n72_ra9v" name="n72" xy="1110,1049" size="208,47" group="n77_ra9v" fontSize="34" color="#5c3c16" text="开启快速吃牌"/>
     <group id="n77_ra9v" name="n77" xy="1110,1045" size="507,50" group="n78_ra9v"/>
     <group id="n78_ra9v" name="n78" xy="1110,1045" size="507,113" group="n58_mk2u" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n83_fgao" name="n83" src="peuqak" fileName="component/setting/images/newsetting/sx_img.png" xy="383,186" size="94,46" group="n58_mk2u">
+    <image id="n83_fgao" name="n83" src="peuqak" fileName="component/setting/images/newsetting/sx_img.png" xy="378,186" size="94,46" group="n58_mk2u">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n85_fgao" name="n85" src="peuqal" fileName="component/setting/images/newsetting/bj_img.png" xy="384,481" size="93,45" group="n58_mk2u">
+    <image id="n85_fgao" name="n85" src="peuqal" fileName="component/setting/images/newsetting/bj_img.png" xy="379,481" size="93,45" group="n58_mk2u">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n86_fgao" name="n86" src="peuqam" fileName="component/setting/images/newsetting/pm_img.png" xy="397,724" size="93,45" group="n58_mk2u">
+    <image id="n86_fgao" name="n86" src="peuqam" fileName="component/setting/images/newsetting/pm_img.png" xy="379,724" size="93,45" group="n58_mk2u">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n87_fgao" name="n87" src="peuqan" fileName="component/setting/images/newsetting/sp_img.png" xy="415,985" size="92,45" group="n58_mk2u">
+    <image id="n87_fgao" name="n87" src="peuqan" fileName="component/setting/images/newsetting/sp_img.png" xy="379,985" size="92,45" group="n58_mk2u">
       <relation target="" sidePair="center-center"/>
     </image>
     <group id="n58_mk2u" name="panel_set" xy="-18,0" size="1714,1410" advanced="true"/>