无冲突同步

fk101/lua_probject/base_project/Game/View/ResultView.lua

@@ -313,8 +313,8 @@ function M:InitBigResult(room, fontsize)
             local item = player_list:AddItemFromPool()
             item:GetChild('txt_name').text = player_info.nick
 
-            local head = item:GetChild('head'):GetChild('n4')
-            ImageLoad.Load(player_info.head_url, head)
+            local head = item:GetChild('head')
+            ImageLoad.Load(player_info.head_url, head._iconObject)
 
             if player_info.entrust ~= nil and player_info.entrust == true then
                 item:GetController('entrust').selectedIndex = 1

fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerCardInfoView.lua

@@ -181,7 +181,9 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat)
 
     self._area_outcard_list:RemoveChildren(0,-1,true)
     local outcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard")
-  
+    outcards.onClick:Set(function()
+        outcards.alpha = 1.1 - outcards.alpha
+    end)
      if outcard==0 then
           outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300"
     else
@@ -228,7 +230,7 @@ end
 function M:UpdateQiPai( qi_list,ispaly,seat)
      self._area_qipai_list:RemoveChildren(0,-1,true)
      for i=1,#qi_list do
-          local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipai")
+          local qicards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Qipais")
           qicards:GetChild("icon").icon = self:getCardItem("ui://Main_RunBeard/202_",qi_list[i])
            if(ispaly)then
              if(i == #qi_list) then

fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/PlayerSelfCardInfoView.lua

@@ -39,13 +39,12 @@ function M:__OnDragEnd(context)
         self.outcard_button = nil
     end
     local button = context.sender
-    
+    local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
     local card = button.data
   
     local _room = DataManager.CurrenRoom
     card.btn_card.sortingOrder = 0
-    -- print("button.y"..button.y .. "_room.curren_outcard_seat".._room.curren_outcard_seat)
-    if (button.y < -380 and _room.curren_outcard_seat == _room.self_player.seat) then
+    if (button.y < self._data_outLinePos - button.height * 0.66 and _room.curren_outcard_seat == _room.self_player.seat) then
         button.touchable = false
         self.outcard_button = card
         self:UpdateIsOnClick(false)
@@ -80,8 +79,8 @@ function M:__OnDragEnd(context)
                 maxmark =#self.card_list-1
             end
         end
-        if button.x+button.width/2 < self.card_list[minmark].btn_card.x and #CountCards<10 then
-            list_remove(self.card_list,card) 
+        if xy.x < self.card_list[minmark].btn_card.x and #CountCards < 10 and xy.y > self._data_outLinePos then
+            list_remove(self.card_list, card)
             local num = 0
             for i=1,#self.card_list do
                 if card.index_X == self.card_list[i].index_X and card.index_Y < self.card_list[i].index_Y then
@@ -106,8 +105,8 @@ function M:__OnDragEnd(context)
             card.index_Y =1
             table.insert(self.card_list,1,card) 
             isChangeCard = true
-        elseif button.x+button.width/2 > (self.card_list[maxmark].btn_card.x +button.width) and #CountCards<10 then
-            list_remove(self.card_list,card) 
+        elseif xy.x > (self.card_list[maxmark].btn_card.x + button.width) and #CountCards < 10 and xy.y > self._data_outLinePos then
+            list_remove(self.card_list, card)
             local num = 0
             for i=1,#self.card_list do
                 if card.index_X == self.card_list[i].index_X then
@@ -134,10 +133,9 @@ function M:__OnDragEnd(context)
             local MoveCardY = 0
             for i=1,#CountCards do
                 local card_view = CountCards[i][1]
-                if card_view~=nil then
-                    if button.x+button.width/2 > card_view.old_postion.x and button.x+button.width/2 < (card_view.old_postion.x+button.width) then
-                        if  card ~= card_view and #CountCards[i] <4 and card.index_X ~= card_view.index_X then
-                             
+                if card_view ~= nil then
+                    if xy.x > card_view.old_postion.x and xy.x < (card_view.old_postion.x + (button.width * 2)) and xy.y > self._data_outLinePos then
+                        if card ~= card_view and #CountCards[i] < 4 and card.index_X ~= card_view.index_X then
                             MoveCardPos = i
                             MoveCardY = #CountCards[i]+1
                             MoveCard = true
@@ -147,40 +145,43 @@ function M:__OnDragEnd(context)
                 end
             end
             local MoveCardindex = 0
-           -- local MoveCardY = 0
-            if button.x+button.width/2 > card.old_postion.x and button.x+button.width/2 < (card.old_postion.x+button.width) then           
-                if #CountCards[card.index_X]>1 then
-                    for i=1,#CountCards[card.index_X] do
+            -- local MoveCardY = 0
+            -- print("lingmeng end", button.y, MoveCard, button.y > self._data_outLinePos,
+            --    button.x + button.width / 2 > card.old_postion.x and
+            --    button.x + button.width / 2 < (card.old_postion.x + button.width) and button.y > self._data_outLinePos)
+            if xy.x > card.old_postion.x and xy.x < (card.old_postion.x + (button.width * 2)) and button.y > self._data_outLinePos then
+                if #CountCards[card.index_X] > 1 then
+                    for i = 1, #CountCards[card.index_X] do
                         local _cv = CountCards[card.index_X][i]
                         if _cv ~= card then
-                            if button.y+button.height/2 > _cv.btn_card.y and button.y+button.height/2 < (_cv.btn_card.y+button.height) then
+                            if xy.y > _cv.btn_card.y and xy.y < (_cv.btn_card.y + button.height) then
                                 --向下移動
-                                if ((button.y+button.height/2) +20) > (card.old_postion.y+button.height)  then
-                                    MoveCardindex  = -1
-                                    MoveCardPos = card.index_X
-                                    MoveCardY = _cv.index_Y
-                                    MoveCard = true
-                                    list_remove(self.card_list,card)  
-                                --向上移動
-                                elseif  ((button.y+button.height/2) -20) < card.old_postion.y  then
-                                    MoveCardindex  = 1
-                                    MoveCardPos = card.index_X
-                                    MoveCardY = _cv.index_Y
-                                    MoveCard = true
-                                    list_remove(self.card_list,card)     
-                                end 
-                            elseif i == #CountCards[card.index_X] and  button.y+button.height/2 < _cv.btn_card.y then
-                                    MoveCardindex  = 1
-                                    MoveCardPos = card.index_X
-                                    MoveCardY = _cv.index_Y
-                                    MoveCard = true
-                                    list_remove(self.card_list,card)  
-                            elseif i == 1 and button.y+button.height/2  > (_cv.btn_card.y+button.width) then
-                                    MoveCardindex  = -1
-                                    MoveCardPos = card.index_X
-                                    MoveCardY = _cv.index_Y
-                                    MoveCard = true
-                                    list_remove(self.card_list,card)  
+                                if i < card.index_Y then
+                                    MoveCardindex = -1
+                                    MoveCardPos   = card.index_X
+                                    MoveCardY     = _cv.index_Y
+                                    MoveCard      = true
+                                    list_remove(self.card_list, card)
+                                    --向上移動
+                                elseif i > card.index_Y then
+                                    MoveCardindex = 1
+                                    MoveCardPos   = card.index_X
+                                    MoveCardY     = _cv.index_Y
+                                    MoveCard      = true
+                                    list_remove(self.card_list, card)
+                                end
+                            elseif i == #CountCards[card.index_X] and button.y + button.height / 2 < _cv.btn_card.y then
+                                MoveCardindex = 1
+                                MoveCardPos   = card.index_X
+                                MoveCardY     = _cv.index_Y
+                                MoveCard      = true
+                                list_remove(self.card_list, card)
+                            elseif i == 1 and button.y + button.height / 2 > (_cv.btn_card.y + button.width * 2) then
+                                MoveCardindex = -1
+                                MoveCardPos   = card.index_X
+                                MoveCardY     = _cv.index_Y
+                                MoveCard      = true
+                                list_remove(self.card_list, card)
                             end
                         end
                     end
@@ -269,7 +270,9 @@ function M:UpdateOutCardList(outcard,isShow,isMopai,seat)
     end
     self._area_outcard_list:RemoveChildren(0,-1,true)
     local outcards =UIPackage.CreateObjectFromURL("ui://Main_RunBeard/Gcm_OutCard")
-  
+    outcards.onClick:Set(function()
+        outcards.alpha = 1.3 - outcards.alpha
+    end)
      if outcard==0 then
           outcards:GetChild("icon").icon ="ui://Main_RunBeard/202_1_300"
     else

fk101/lua_probject/extend_project/extend/zipai/changdepaohuzi/main/ZPMainView.lua

@@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
         local typeface = _data['game_cardsize']
         local _gamectr = self._gamectr
         if typeface == 0 then
-            self._room.change_card_size = 1.2
+            self._room.change_card_size = 2
         elseif typeface == 1 then
-            self._room.change_card_size = 1
+            self._room.change_card_size = 1.8
         elseif typeface == 2 then
-            self._room.change_card_size = 0.8
+            self._room.change_card_size = 1.8
         end
     else
         self._room.change_card_size = change_card_size
@@ -300,11 +300,11 @@ end
 -- 设置 更新 手牌大小
 function M:UpdateCardSize(index)
     if index == 0 then
-        self._room.change_card_size = 1.2
+        self._room.change_card_size = 2
     elseif index == 1 then
-        self._room.change_card_size = 1
+        self._room.change_card_size = 1.8
     elseif index == 2 then
-        self._room.change_card_size = 0.8
+        self._room.change_card_size = 1.8
     end
     local info = self._player_card_info[1]
     info:UpdateCardSize()

fk101/lua_probject/extend_project/extend/zipai/fulushou/main/ZPMainView.lua

@@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
         local typeface = _data['game_cardsize']
         local _gamectr = self._gamectr
         if typeface == 0 then
-            self._room.change_card_size = 1.2
+            self._room.change_card_size = 2
         elseif typeface == 1 then
-            self._room.change_card_size = 1
+            self._room.change_card_size = 1.8
         elseif typeface == 2 then
-            self._room.change_card_size = 0.8
+            self._room.change_card_size = 1.8
         end
     else
         self._room.change_card_size = change_card_size
@@ -299,11 +299,11 @@ end
 -- 设置 更新 手牌大小
 function M:UpdateCardSize(index)
     if index == 0 then
-        self._room.change_card_size = 1.2
+        self._room.change_card_size = 2
     elseif index == 1 then
-        self._room.change_card_size = 1
+        self._room.change_card_size = 1.8
     elseif index == 2 then
-        self._room.change_card_size = 0.8
+        self._room.change_card_size = 1.8
     end
     local info = self._player_card_info[1]
     info:UpdateCardSize()

fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/main/ZPMainView.lua

@@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
         local typeface = _data['game_cardsize']
         local _gamectr = self._gamectr
         if typeface == 0 then
-            self._room.change_card_size = 1.2
+            self._room.change_card_size = 2
         elseif typeface == 1 then
-            self._room.change_card_size = 1
+            self._room.change_card_size = 1.8
         elseif typeface == 2 then
-            self._room.change_card_size = 0.8
+            self._room.change_card_size = 1.8
         end
     else
         self._room.change_card_size = change_card_size
@@ -299,11 +299,11 @@ end
 -- 设置 更新 手牌大小
 function M:UpdateCardSize(index)
     if index == 0 then
-        self._room.change_card_size = 1.2
+        self._room.change_card_size = 2
     elseif index == 1 then
-        self._room.change_card_size = 1
+        self._room.change_card_size = 1.8
     elseif index == 2 then
-        self._room.change_card_size = 0.8
+        self._room.change_card_size = 1.8
     end
     local info = self._player_card_info[1]
     info:UpdateCardSize()

fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/main/ZPMainView.lua

@@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
         local typeface = _data['game_cardsize']
         local _gamectr = self._gamectr
         if typeface == 0 then
-            self._room.change_card_size = 1.2
+            self._room.change_card_size = 2
         elseif typeface == 1 then
-            self._room.change_card_size = 1
+            self._room.change_card_size = 1.8
         elseif typeface == 2 then
-            self._room.change_card_size = 0.8
+            self._room.change_card_size = 1.8
         end
     else
         self._room.change_card_size = change_card_size
@@ -300,11 +300,11 @@ end
 -- 设置 更新 手牌大小
 function M:UpdateCardSize(index)
     if index == 0 then
-        self._room.change_card_size = 1.2
+        self._room.change_card_size = 2
     elseif index == 1 then
-        self._room.change_card_size = 1
+        self._room.change_card_size = 1.8
     elseif index == 2 then
-        self._room.change_card_size = 0.8
+        self._room.change_card_size = 1.8
     end
     local info = self._player_card_info[1]
     info:UpdateCardSize()

fk101/lua_probject/main_project/main/zipai/ZPMainView.lua

@@ -86,11 +86,11 @@ function M:InitView(url, isdisplay, open_social, change_card_size, qihu)
         local typeface = _data['game_cardsize']
         local _gamectr = self._gamectr
         if typeface == 0 then
-            self._room.change_card_size = 1.2
+            self._room.change_card_size = 2
         elseif typeface == 1 then
-            self._room.change_card_size = 1
+            self._room.change_card_size = 1.8
         elseif typeface == 2 then
-            self._room.change_card_size = 0.8
+            self._room.change_card_size = 1.8
         end
     else
         self._room.change_card_size = change_card_size
@@ -254,11 +254,11 @@ end
 -- 设置 更新 手牌大小
 function M:UpdateCardSize(index)
     if index == 0 then
-        self._room.change_card_size = 1.2
+        self._room.change_card_size = 2
     elseif index == 1 then
-        self._room.change_card_size = 1
+        self._room.change_card_size = 1.8
     elseif index == 2 then
-        self._room.change_card_size = 0.8
+        self._room.change_card_size = 1.8
     end
     local info = self._player_card_info[1]
     info:UpdateCardSize()

fk101/lua_probject/main_project/main/zipai/ZPPlayerSelfCardInfoView.lua

@@ -62,11 +62,13 @@ function M:init()
     self._area_outcard_list = view:GetChild('area_outcard_list')
     self._area_fz_list = view:GetChild('area_fz_list')
     self._area_qipai_list = view:GetChild('windcard_list')
+    self._view_outLine = view:GetChild('n38')
     self._mask_liangpai = view:GetChild('mask_liangpai')
     UIPackage.AddPackage('base/main_zipai/ui/Main_RunBeard')
 	self.ctr_piao = self._view:GetController('piao')
     self.ctr_piao_value = self._view:GetController('piaovalue')
-	self:BtnEvent()
+    self:UpdateOutLine()
+    self:BtnEvent()
 end
 
 
@@ -459,6 +461,17 @@ function M:UpdateCardSize()
         self._area_handcard_list:AddChild(card_view.btn_card)
         card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
     end
+    self:UpdateOutLine()
+    self:UpdateHandCardsPos()
+end
+
+function M:UpdateOutLine()
+    if self:getCardSize() == 1.8 then
+        self._data_outLinePos = 135 - (170 * 3)
+    elseif self:getCardSize() == 2 then
+        self._data_outLinePos = 160 - (195 * 3)
+    end
+    self._view_outLine.y = self._data_outLinePos + self._area_handcard_list.height - 80
 end
 
 function M:UpdateIsOnClick(isOut)
@@ -729,6 +742,10 @@ function M:GetHandCardPos(cards_view, cards)
         y = 70 - (100 * cards_view.index_Y)
     elseif self:getCardSize() == 0.8 then
         y = 100 - (65 * cards_view.index_Y)
+    elseif self:getCardSize() == 1.8 then
+        y = 105 - (162 * cards_view.index_Y)
+    elseif self:getCardSize() == 2 then
+        y = 105 - (180 * cards_view.index_Y)
     end
     return Vector2.New(x, y)
 end
@@ -856,7 +873,7 @@ function M:getCardSize()
     if self._room.change_card_size ~= nil then
         return self._room.change_card_size
     else
-        return 1
+        return 1.6
     end
 end
 

fk101/wb_new_ui/.objs/metas/35sf1c1f/r05e8u.info

@@ -1,12 +1,18 @@
 {
   "objectStatus": {
+    "n183_yfzf": {
+      "collapsed": true
+    },
     "n193_syh3": {
+      "locked": true,
       "hidden": true
     },
     "n206_ib2w": {
+      "locked": true,
       "hidden": true
     },
     "n198_h5b1": {
+      "locked": true,
       "hidden": true
     }
   }

fk101/wb_new_ui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 283,
+  "libview.firstColumnWidth": 413,
   "expanded_nodes": [
     "27vd145b",
     "/",

fk101/wb_new_ui/assets/Extend_Poker_ChangdeWHZ/component/clearing/result_zipai_head.xml

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="55,55" scroll="both" mask="n3_ejbe">
+<component size="55,55" scroll="both" extention="Button" mask="n3_ejbe">
   <displayList>
-    <loader id="n4_ejbe" name="n4" xy="0,0" size="55,55" restrictSize="55,55,55,55" aspect="true" url="ui://egnzysm7ffp35l" vAlign="middle" fill="scale" playing="false">
+    <loader id="n4_ejbe" name="icon" xy="0,0" size="55,55" restrictSize="55,55,55,55" aspect="true" url="ui://egnzysm7ffp35l" vAlign="middle" fill="scale" playing="false">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <graph id="n3_ejbe" name="n3" xy="0,0" size="55,55" aspect="true" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
   </displayList>
+  <Button/>
 </component>

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

@@ -7,7 +7,6 @@
   <controller name="bg_state" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n196_h5b1" name="n196" src="r05e7p" fileName="component/Main/images/floorTop.png" xy="736,25"/>
-    <text id="n205_e5js" name="text_playName" xy="1268,504" pivot="0.5,0" size="0,124" font="ui://35sf1c1fr05e8v" fontSize="120" autoClearText="true" text="fffffffffdddd"/>
     <text id="n176_fgao" name="di_text" xy="743,41" size="313,56" group="n150_8th3" font="ui://27vd145bpxed7ik2" fontSize="32" color="#ffffff" vAlign="middle" autoSize="none" text="玩法名称">
       <gearDisplay controller="state" pages="0,1,2"/>
       <gearColor controller="bg_state" pages="0,1" values="#ffffff,#296137|#655c6a,#322e34" default="#367c7d,#235557"/>
@@ -27,11 +26,11 @@
       <gearDisplay controller="state" pages="1,2"/>
       <relation target="" sidePair="middle-middle"/>
     </component>
-    <image id="n177_cbxl" name="n177" src="r05e9l" fileName="images/icon_paopaofa_shengyu.png" xy="1121,115">
+    <image id="n177_cbxl" name="n177" src="r05e9l" fileName="images/icon_paopaofa_shengyu.png" xy="1121,130">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center"/>
     </image>
-    <text id="n27" name="remaining_card" xy="1183,114" size="165,49" font="Microsoft YaHei" fontSize="34" align="center" autoSize="none" text="剩余20张">
+    <text id="n27" name="remaining_card" xy="1183,129" size="165,49" font="Microsoft YaHei" fontSize="34" align="center" autoSize="none" text="剩余20张">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center"/>
     </text>
@@ -40,30 +39,30 @@
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="width-width,bottom-bottom"/>
     </component>
-    <component id="n151_8th3" name="player_card_info2" src="r05e76" fileName="component/Main/component/Player_card_info_2.xml" xy="311,52" size="538,402">
+    <component id="n151_8th3" name="player_card_info2" src="r05e76" fileName="component/Main/component/Player_card_info_2.xml" xy="284,52" size="538,402">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n147_nu0l" sidePair="left-left"/>
     </component>
-    <component id="n147_nu0l" name="player_info2" src="r05e78" fileName="component/Main/component/PlayerHead_2.xml" xy="63,54" size="200,300">
+    <component id="n147_nu0l" name="player_info2" src="r05e78" fileName="component/Main/component/PlayerHead_2.xml" xy="36,54" size="200,300" scale="1.3,1.3">
       <relation target="" sidePair="rightext-left,topext-top,bottomext-top,leftext-left"/>
     </component>
     <component id="n194_syh3" name="gcm_chat" src="r05e9m" fileName="component/Main/Main_2_chat.xml" xy="2380,376" visible="false"/>
-    <component id="n7" name="player_info1" src="r05e6v" fileName="component/Main/component/PlayerHead_1.xml" xy="49,707" size="200,300">
-      <gearXY controller="state" pages="0,1,2,3" values="69,602|49,707|54,675|48,570"/>
+    <component id="n7" name="player_info1" src="r05e6v" fileName="component/Main/component/PlayerHead_1.xml" xy="49,670" size="200,300" scale="1.3,1.3">
+      <gearXY controller="state" pages="0,1,2,3" values="69,602|49,670|54,675|48,570"/>
       <relation target="" sidePair="rightext-left,topext-bottom%,bottomext-bottom,leftext-left"/>
     </component>
     <component id="n34_k3io" name="btn_ready1" src="r05e2" fileName="buttons/Btn_Yellow.xml" xy="1090,739" group="n36_k3io" visible="false">
       <gearDisplay controller="action" pages="0"/>
       <Button icon="ui://35sf1c1fr05e9x"/>
     </component>
-    <component id="n35_k3io" name="btn_start1" src="r05e2" fileName="buttons/Btn_Yellow.xml" xy="1094,741" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start1" src="r05e2" fileName="buttons/Btn_Yellow.xml" xy="1094,741" group="n36_k3io" visible="false" touchable="false">
       <Button icon="ui://35sf1c1fr05e9y"/>
     </component>
     <component id="n169_o49p" name="btn_ready" src="r05e32" fileName="component/game/btn_ready.xml" xy="782,746" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
       <Button icon="ui://35sf1c1fr05e9z"/>
     </component>
-    <component id="n170_o49p" name="btn_start" src="r05e3" fileName="buttons/Btn_newYellow_long.xml" xy="1166,749" size="242,124" group="n36_k3io" visible="false">
+    <component id="n170_o49p" name="btn_start" src="r05e3" fileName="buttons/Btn_newYellow_long.xml" xy="1166,749" size="242,124" group="n36_k3io" visible="false" touchable="false">
       <Button icon="ui://35sf1c1fr05ea0"/>
     </component>
     <component id="n184_a81d" name="btn_xipai" src="r05e7a" fileName="component/Main/component/btn_xipai.xml" xy="1361,746" group="n36_k3io">
@@ -84,11 +83,11 @@
       <gearDisplay controller="state" pages="3"/>
       <relation target="" sidePair="center-center"/>
     </image>
-    <text id="n42_lryk" name="tex_round" xy="1063,187" size="405,64" group="n154_r1mo" font="Microsoft YaHei" fontSize="42" color="#ffffff" align="center" autoSize="none" text="1/8局">
+    <text id="n42_lryk" name="tex_round" xy="1063,217" size="405,64" group="n154_r1mo" font="Microsoft YaHei" fontSize="42" color="#ffffff" align="center" autoSize="none" text="1/8局">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="" sidePair="center-center"/>
     </text>
-    <group id="n154_r1mo" name="n154" xy="1063,187" size="405,64" advanced="true">
+    <group id="n154_r1mo" name="n154" xy="1063,217" size="405,64" advanced="true">
       <gearDisplay controller="jushu" pages="1"/>
     </group>
     <loader id="n153_8th3" name="cardAnima" xy="625,86" size="50,30" visible="false" touchable="false" url="ui://3bfrwj0h8th37l" autoSize="true">
@@ -111,11 +110,11 @@
     <component id="n179_kxwj" name="btn_distance" src="r05e34" 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" visible="false" type="rect" lineSize="0" fillColor="#40000000">
+    <graph id="n206_ib2w" name="safe_close" xy="0,0" size="2532,1172" visible="false" touchable="false" type="rect" lineSize="0" fillColor="#40000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n198_h5b1" name="safe_bg" src="r05eae" fileName="component/Main/main_2_safe_bg.xml" xy="2335,0" size="200,1170" visible="false"/>
-    <component id="n193_syh3" name="btn_safe" src="r05eag" fileName="component/Main/btn_safe.xml" xy="2383,19" size="109,109" visible="false"/>
+    <component id="n198_h5b1" name="safe_bg" src="r05eae" fileName="component/Main/main_2_safe_bg.xml" xy="2335,0" size="200,1170" visible="false" touchable="false"/>
+    <component id="n193_syh3" name="btn_safe" src="r05eag" fileName="component/Main/btn_safe.xml" xy="2383,19" size="109,109" visible="false" touchable="false"/>
     <component id="n201_o0c1" name="btn_rule" src="r05e4u" fileName="component/Main/component/Folder/component/phone_info/Btn_rule.xml" xy="1308,44" group="n183_yfzf"/>
     <component id="n166_o49p" name="btn_back_lobby" src="r05e4c" fileName="component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml" xy="1845,15" group="n183_yfzf">
       <gearDisplay controller="state" pages="0,3"/>

fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml

@@ -3,12 +3,12 @@
   <controller name="chupai" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1,,3,,4," selected="0"/>
   <controller name="piaovalue" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
-  <controller name="niao" pages="0,,1," selected="1"/>
+  <controller name="niao" pages="0,,1," selected="0"/>
   <displayList>
     <list id="n36_lr5d" name="windcard_list" xy="2494,215" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://35sf1c1fr05eb">
       <relation target="" sidePair="right-right"/>
     </list>
-    <list id="n35_lr5d" name="area_fz_list" xy="1068,201" pivot="0.5,0.5" size="416,231" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="20" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
+    <list id="n35_lr5d" name="area_fz_list" xy="1068,201" pivot="0.5,0.5" size="416,231" scale="1.5,1.5" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="20" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="rightext-left,topext-bottom,bottomext-bottom,leftext-left"/>
       <item/>
       <item/>
@@ -20,7 +20,6 @@
     <component id="n38_ey1o" name="n38" src="r05e60" fileName="component/Main/component/PromptOutCard.xml" xy="16,-177" size="1577,5">
       <gearDisplay controller="chupai" pages="1"/>
     </component>
-    <component id="n27" name="area_outcard_list" src="r05e5y" fileName="component/Component1.xml" xy="1178,-899" size="100,100"/>
     <component id="n39_j34t" name="piao0" src="r05e64" fileName="component/piao/btn_nopiao.xml" xy="668,-20" group="n45_j34t">
       <gearDisplay controller="piao" pages="1,3,4"/>
       <Button controller="piaovalue" page="0"/>
@@ -58,6 +57,7 @@
     <group id="n48_cphv" name="niao" xy="746,-342" size="1030,169" advanced="true">
       <relation target="" sidePair=""/>
     </group>
+    <component id="n27" name="area_outcard_list" src="r05e5y" fileName="component/Component1.xml" xy="1178,-899" size="100,100"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="XY" target="n27" tween="true" startValue="490,-350" endValue="1136.53,-161.41" duration="4"/>

fk101/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" opaque="false" initName="player_card_info">
   <displayList>
-    <list id="n47_lr5d" name="area_fz_list" xy="0,31" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="20" align="right" vAlign="bottom"/>
-    <list id="n48_lr5d" name="windcard_list" xy="0,350" size="535,530" touchable="false" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw"/>
+    <list id="n47_lr5d" name="area_fz_list" xy="290,71" pivot="0.5,0.5" size="713,268" scale="1.5,1.5" rotation="180" layout="row" scroll="horizontal" colGap="20" align="right" vAlign="bottom"/>
+    <list id="n48_lr5d" name="windcard_list" xy="0,450" size="535,530" touchable="false" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw"/>
     <component id="n50_n1ry" name="mask_liangpai" src="r05e5y" fileName="component/Component1.xml" xy="200,83" size="5,5"/>
     <component id="n25" name="area_outcard_list" src="r05e5y" fileName="component/Component1.xml" xy="289,-46" size="100,100"/>
     <component id="n51_n7o4" name="area_handcard_list" src="r05e5y" fileName="component/Component1.xml" xy="6,680" size="717,533" touchable="false"/>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="851,1170" designImageLayer="1">
+<component size="919,1170" designImageLayer="1">
   <controller name="state" pages="0,,1,,2," selected="0"/>
   <controller name="bg" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <controller name="cards" pages="0,,1,,2,,3," selected="0"/>
@@ -8,102 +8,102 @@
   <controller name="yuyin" pages="0,,1," selected="0"/>
   <controller name="chupai" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n82_fgao" name="n82" src="r05ebz" fileName="component/setting/images/newsetting/dk_img.png" xy="0,0" size="849,1170"/>
-    <graph id="n0_mk2u" name="btn_close" xy="-554,859" size="2548,1026" visible="false" touchable="false" type="rect" lineSize="0" fillColor="#00000000">
+    <image id="n82_fgao" name="n82" src="r05ebz" fileName="component/setting/images/newsetting/dk_img.png" xy="0,0"/>
+    <graph id="n0_mk2u" name="btn_close" xy="-486,859" size="2548,1026" visible="false" touchable="false" type="rect" lineSize="0" fillColor="#00000000">
       <relation target="" sidePair="right-right"/>
     </graph>
-    <component id="n90_voqg" name="btn_dismiss_room" src="r05e6" fileName="buttons/Btn_Yellow_New.xml" xy="1549,1599" size="270,0" group="n135_voqg" visible="false">
-      <Button icon="ui://35sf1c1fr05e8h"/>
+    <component id="n90_voqg" name="btn_dismiss_room" src="93q2c0" fileName="buttons/Btn_Yellow_New.xml" pkg="27vd145b" xy="2457,1186" size="270,0" group="n135_voqg" visible="false">
+      <Button icon="ui://35sf1c1fjlv9ss"/>
     </component>
-    <text id="n91_voqg" name="n91" xy="1839,1617" size="63,38" group="n135_voqg" visible="false" fontSize="30" color="#624720" vAlign="middle" autoSize="none" text="(30)"/>
-    <component id="n92_voqg" name="btn_quit" src="r05e8" fileName="buttons/Button_1.xml" xy="1130,1860" size="288,0" group="n135_voqg" visible="false" touchable="false">
+    <text id="n91_voqg" name="n91" xy="2747,1204" size="63,38" group="n135_voqg" visible="false" fontSize="30" color="#624720" vAlign="middle" autoSize="none" text="(30)"/>
+    <component id="n92_voqg" name="btn_quit" src="lwcl2n" fileName="buttons/Button_1.xml" pkg="27vd145b" xy="2038,1447" size="288,0" group="n135_voqg" visible="false" touchable="false">
       <Button icon="ui://823o5jy4n6fsh1"/>
     </component>
-    <component id="n93_voqg" name="btn_logout" src="r05e6" fileName="buttons/Btn_Yellow_New.xml" xy="1519,1860" size="298,0" group="n135_voqg" visible="false">
-      <Button icon="ui://35sf1c1fr05e8i"/>
+    <component id="n93_voqg" name="btn_logout" src="93q2c0" fileName="buttons/Btn_Yellow_New.xml" pkg="27vd145b" xy="2427,1447" size="298,0" group="n135_voqg" visible="false">
+      <Button icon="ui://35sf1c1fjlv9st"/>
     </component>
-    <component id="n94_voqg" name="btn_close22" src="r05e0" fileName="buttons/Btn_close.xml" xy="1726,759" size="101,100" group="n135_voqg" visible="false" controller="style,0"/>
-    <component id="n96_voqg" name="btn_sound" src="r05ec5" fileName="component/setting/Button4.xml" xy="12,0" size="113,0" group="n102_voqg" visible="false">
-      <Button icon="ui://35sf1c1fr05e8p"/>
+    <component id="n94_voqg" name="btn_close22" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="2634,346" size="101,100" group="n135_voqg" visible="false" controller="style,0"/>
+    <component id="n96_voqg" name="btn_sound" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="995,8" size="113,0" group="n102_voqg" visible="false">
+      <Button icon="ui://35sf1c1fjlv9su"/>
     </component>
-    <component id="n97_voqg" name="btn_music" src="r05ec5" fileName="component/setting/Button4.xml" xy="16,2" size="113,0" group="n102_voqg" visible="false"/>
-    <component id="n98_voqg" name="slider_sound" src="r05e84" fileName="component/Main/setting/component/Slider1.xml" xy="225,154" size="347,45" group="n102_voqg" visible="false">
+    <component id="n97_voqg" name="btn_music" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="999,10" size="113,0" group="n102_voqg" visible="false"/>
+    <component id="n98_voqg" name="slider_sound" src="jlv9sv" fileName="component/setting/setting/component/Slider1.xml" xy="1208,162" size="347,45" group="n102_voqg" visible="false">
       <Slider value="50" max="100"/>
     </component>
-    <component id="n101_voqg" name="slider_music" src="r05e84" fileName="component/Main/setting/component/Slider1.xml" xy="225,225" size="347,45" group="n102_voqg" visible="false">
+    <component id="n101_voqg" name="slider_music" src="jlv9sv" fileName="component/setting/setting/component/Slider1.xml" xy="1208,233" size="347,45" group="n102_voqg" visible="false">
       <Slider value="50" max="100"/>
     </component>
-    <group id="n102_voqg" name="n102" xy="12,0" size="560,270" group="n135_voqg" advanced="true"/>
-    <list id="n95_voqg" name="lst_bg" xy="1364,1096" size="582,185" group="n135_voqg" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="35" colGap="50" lineItemCount="3" defaultItem="ui://35sf1c1fr05e7u">
+    <group id="n102_voqg" name="n102" xy="995,8" size="560,270" group="n135_voqg" advanced="true"/>
+    <list id="n95_voqg" name="lst_bg" xy="2307,683" size="582,185" group="n135_voqg" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="35" colGap="50" lineItemCount="3" defaultItem="ui://35sf1c1fjlv9t0">
       <relation target="" sidePair="center-center"/>
     </list>
-    <image id="n103_voqg" name="n103" src="r05e8q" fileName="component/Main/setting/images/setting/zipai_font_01.png" xy="1452,1354" group="n111_voqg"/>
-    <image id="n104_voqg" name="n104" src="r05e8r" fileName="component/Main/setting/images/setting/zipai_font_02.png" xy="1663,1358" group="n111_voqg"/>
-    <image id="n105_voqg" name="n105" src="r05e8s" fileName="component/Main/setting/images/setting/zipai_font_03.png" xy="1452,1492" group="n111_voqg"/>
-    <image id="n106_voqg" name="n106" src="r05e8t" fileName="component/Main/setting/images/setting/zipai_font_04.png" xy="1663,1492" group="n111_voqg" visible="false"/>
-    <component id="n107_voqg" name="n107" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1531,1377" group="n111_voqg">
+    <image id="n103_voqg" name="n103" src="jlv9t2" fileName="component/setting/setting/images/setting/zipai_font_01.png" xy="2395,941" group="n111_voqg"/>
+    <image id="n104_voqg" name="n104" src="jlv9t3" fileName="component/setting/setting/images/setting/zipai_font_02.png" xy="2606,945" group="n111_voqg"/>
+    <image id="n105_voqg" name="n105" src="jlv9t4" fileName="component/setting/setting/images/setting/zipai_font_03.png" xy="2395,1079" group="n111_voqg"/>
+    <image id="n106_voqg" name="n106" src="jlv9t5" fileName="component/setting/setting/images/setting/zipai_font_04.png" xy="2606,1079" group="n111_voqg" visible="false"/>
+    <component id="n107_voqg" name="n107" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2474,964" group="n111_voqg">
       <Button checked="true"/>
     </component>
-    <component id="n108_voqg" name="n108" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1749,1377" group="n111_voqg"/>
-    <component id="n109_voqg" name="n109" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1531,1506" group="n111_voqg"/>
-    <component id="n110_voqg" name="n110" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1749,1506" group="n111_voqg" visible="false"/>
-    <group id="n111_voqg" name="n111" xy="1452,1354" size="420,227" group="n135_voqg" advanced="true">
+    <component id="n108_voqg" name="n108" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2692,964" group="n111_voqg"/>
+    <component id="n109_voqg" name="n109" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2474,1093" group="n111_voqg"/>
+    <component id="n110_voqg" name="n110" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2692,1093" group="n111_voqg" visible="false"/>
+    <group id="n111_voqg" name="n111" xy="2395,941" size="420,227" group="n135_voqg" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n114_voqg" name="n114" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1453,1686" group="n115_voqg">
+    <component id="n114_voqg" name="n114" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2396,1273" group="n115_voqg">
       <Button checked="true" title="大" titleColor="#624720" titleFontSize="35" controller="size" page="0"/>
     </component>
-    <component id="n112_voqg" name="n112" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1589,1686" group="n115_voqg">
+    <component id="n112_voqg" name="n112" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2532,1273" group="n115_voqg">
       <Button title="中" titleColor="#624720" titleFontSize="35" controller="size" page="1"/>
     </component>
-    <component id="n113_voqg" name="n113" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1724,1686" group="n115_voqg">
+    <component id="n113_voqg" name="n113" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2667,1273" group="n115_voqg">
       <Button title="小" titleColor="#624720" titleFontSize="35" controller="size" page="2"/>
     </component>
-    <group id="n115_voqg" name="n115" xy="1453,1686" size="394,47" group="n135_voqg" advanced="true">
+    <group id="n115_voqg" name="n115" xy="2396,1273" size="394,47" group="n135_voqg" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n116_voqg" name="n116" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1374,1936" group="n118_voqg">
+    <component id="n116_voqg" name="n116" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2282,1523" group="n118_voqg">
       <Button checked="true" title="方言" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <component id="n117_voqg" name="n117" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1579,1936" group="n118_voqg">
+    <component id="n117_voqg" name="n117" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2487,1523" group="n118_voqg">
       <Button title="普通话" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <group id="n118_voqg" name="n118" xy="1374,1936" size="328,47" group="n135_voqg" advanced="true"/>
-    <component id="n119_voqg" name="n119" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1513,1850" group="n122_voqg">
+    <group id="n118_voqg" name="n118" xy="2282,1523" size="328,47" group="n135_voqg" advanced="true"/>
+    <component id="n119_voqg" name="n119" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2421,1437" group="n122_voqg">
       <Button checked="true" title="否" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <component id="n120_voqg" name="n120" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1662,1850" group="n122_voqg">
+    <component id="n120_voqg" name="n120" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2570,1437" group="n122_voqg">
       <Button title="是" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <text id="n121_voqg" name="n121" xy="1277,1850" size="184,42" group="n122_voqg" fontSize="30" color="#624920" bold="true" text="禁止接收语音"/>
-    <group id="n122_voqg" name="n122" xy="1277,1850" size="508,47" group="n127_voqg"/>
-    <component id="n123_voqg" name="n123" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1513,1784" group="n126_voqg">
+    <text id="n121_voqg" name="n121" xy="2185,1437" size="184,41" group="n122_voqg" fontSize="30" color="#624920" bold="true" text="禁止接收语音"/>
+    <group id="n122_voqg" name="n122" xy="2185,1437" size="508,47" group="n127_voqg"/>
+    <component id="n123_voqg" name="n123" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2421,1371" group="n126_voqg">
       <Button checked="true" title="否" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <component id="n124_voqg" name="n124" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1662,1784" group="n126_voqg">
+    <component id="n124_voqg" name="n124" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="2570,1371" group="n126_voqg">
       <Button title="是" titleColor="#624720" titleFontSize="35"/>
     </component>
-    <text id="n125_voqg" name="n125" xy="1277,1788" size="184,42" group="n126_voqg" fontSize="30" color="#624920" bold="true" text="开启快速吃牌"/>
-    <group id="n126_voqg" name="n126" xy="1277,1784" size="508,47" group="n127_voqg"/>
-    <group id="n127_voqg" name="n127" xy="1277,1784" size="508,113" group="n135_voqg" advanced="true"/>
-    <image id="n128_voqg" name="n128" src="r05ebx" fileName="component/setting/images/newsetting/szbt_img.png" xy="1498,767" group="n130_voqg"/>
-    <image id="n129_voqg" name="n129" src="r05eby" fileName="component/setting/images/newsetting/szz_img.png" xy="1605,785" group="n130_voqg"/>
-    <group id="n130_voqg" name="n130" xy="1498,767" size="315,93" group="n135_voqg" advanced="true">
+    <text id="n125_voqg" name="n125" xy="2185,1375" size="184,41" group="n126_voqg" fontSize="30" color="#624920" bold="true" text="开启快速吃牌"/>
+    <group id="n126_voqg" name="n126" xy="2185,1371" size="508,47" group="n127_voqg"/>
+    <group id="n127_voqg" name="n127" xy="2185,1371" size="508,113" group="n135_voqg" advanced="true"/>
+    <image id="n128_voqg" name="n128" src="r05ebx" fileName="component/setting/images/newsetting/szbt_img.png" xy="2441,354" group="n130_voqg"/>
+    <image id="n129_voqg" name="n129" src="r05eby" fileName="component/setting/images/newsetting/szz_img.png" xy="2548,372" group="n130_voqg"/>
+    <group id="n130_voqg" name="n130" xy="2441,354" size="315,105" group="n135_voqg" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n131_voqg" name="n131" src="r05ec0" fileName="component/setting/images/newsetting/sx_img.png" xy="1561,858" group="n135_voqg">
+    <image id="n131_voqg" name="n131" src="r05ec0" fileName="component/setting/images/newsetting/sx_img.png" xy="2504,445" group="n135_voqg">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n132_voqg" name="n132" src="r05ec1" fileName="component/setting/images/newsetting/bj_img.png" xy="1561,1048" group="n135_voqg">
+    <image id="n132_voqg" name="n132" src="r05ec1" fileName="component/setting/images/newsetting/bj_img.png" xy="2504,635" group="n135_voqg">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n133_voqg" name="n133" src="r05ec2" fileName="component/setting/images/newsetting/pm_img.png" xy="1561,1306" group="n135_voqg">
+    <image id="n133_voqg" name="n133" src="r05ec2" fileName="component/setting/images/newsetting/pm_img.png" xy="2504,893" group="n135_voqg">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n134_voqg" name="n134" src="r05ec3" fileName="component/setting/images/newsetting/sp_img.png" xy="1561,1607" group="n135_voqg">
+    <image id="n134_voqg" name="n134" src="r05ec3" fileName="component/setting/images/newsetting/sp_img.png" xy="2504,1194" group="n135_voqg">
       <relation target="" sidePair="center-center"/>
     </image>
-    <group id="n135_voqg" name="panel_set" xy="12,0" size="1934,1983" visible="false" advanced="true"/>
-    <component id="n136_voqg" name="showview" src="r05ec4" fileName="component/setting/images/newsetting/Component5.xml" xy="0,1"/>
+    <group id="n135_voqg" name="panel_set" xy="995,8" size="1894,1562" visible="false" advanced="true"/>
+    <component id="n136_voqg" name="showview" src="r05ec4" fileName="component/setting/images/newsetting/Component5.xml" xy="57,86" size="772,980"/>
   </displayList>
 </component>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="851,1170" overflow="scroll" designImageLayer="1">
+<component size="919,1170" overflow="scroll" designImageLayer="1">
   <controller name="bg" pages="0,,1,,2,,3,,4,,5," selected="0"/>
   <controller name="state" pages="0,,1,,2," selected="0"/>
   <controller name="cards" pages="0,,1,,2,,3," selected="0"/>
@@ -8,114 +8,110 @@
   <controller name="yuyin" pages="0,,1," selected="0"/>
   <controller name="chupai" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n27_mk2u" name="btn_dismiss_room" src="r05e6" fileName="buttons/Btn_Yellow_New.xml" xy="419,840" size="270,0" group="n58_mk2u" visible="false">
-      <Button icon="ui://35sf1c1fr05e8h"/>
+    <component id="n27_mk2u" name="btn_dismiss_room" src="93q2c0" fileName="buttons/Btn_Yellow_New.xml" pkg="27vd145b" xy="419,630" size="270,0" group="n58_mk2u" visible="false">
+      <Button icon="ui://35sf1c1fjlv9ss"/>
     </component>
-    <text id="n28_mk2u" name="n28" xy="709,858" size="63,38" group="n58_mk2u" visible="false" fontSize="30" color="#624720" vAlign="middle" autoSize="none" text="(30)"/>
-    <component id="n29_mk2u" name="btn_quit" src="r05e8" fileName="buttons/Button_1.xml" xy="1218,1328" size="288,82" group="n58_mk2u" visible="false" touchable="false">
+    <text id="n28_mk2u" name="n28" xy="709,648" size="63,38" group="n58_mk2u" visible="false" fontSize="30" color="#624720" vAlign="middle" autoSize="none" text="(30)"/>
+    <component id="n29_mk2u" name="btn_quit" src="lwcl2n" fileName="buttons/Button_1.xml" pkg="27vd145b" xy="0,891" size="288,0" group="n58_mk2u" visible="false" touchable="false">
       <Button icon="ui://823o5jy4n6fsh1"/>
     </component>
-    <component id="n30_mk2u" name="btn_logout" src="r05e6" fileName="buttons/Btn_Yellow_New.xml" xy="1426,805" size="270,96" group="n58_mk2u" visible="false">
-      <Button icon="ui://35sf1c1fr05e8i"/>
+    <component id="n30_mk2u" name="btn_logout" src="93q2c0" fileName="buttons/Btn_Yellow_New.xml" pkg="27vd145b" xy="389,891" size="298,0" group="n58_mk2u" visible="false">
+      <Button icon="ui://35sf1c1fjlv9st"/>
     </component>
-    <component id="n33_mk2u" name="btn_close22" src="r05e0" fileName="buttons/Btn_close.xml" xy="596,0" size="87,92" group="n58_mk2u" visible="false" controller="style,0"/>
-    <list id="n34_mk2u" name="lst_bg" xy="-18,559" size="898,105" group="n58_mk2u" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="35" colGap="30" lineItemCount="3" defaultItem="ui://35sf1c1fr05e7u" align="center" vAlign="middle" autoClearItems="true">
+    <component id="n33_mk2u" name="btn_close22" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="792,2" group="n58_mk2u" visible="false" controller="style,0"/>
+    <list id="n34_mk2u" name="lst_bg" xy="185,337" size="582,185" group="n58_mk2u" visible="false" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="35" colGap="50" lineItemCount="3" defaultItem="ui://35sf1c1fjlv9t0" vAlign="middle">
       <relation target="" sidePair="center-center"/>
-      <item/>
-      <item/>
-      <item/>
     </list>
-    <component id="n35_mk2u" name="btn_sound" src="r05ec5" fileName="component/setting/Button4.xml" xy="875,285" size="217,58" group="n41_mk2u" visible="false">
-      <Button icon="ui://35sf1c1fr05e8p"/>
+    <component id="n35_mk2u" name="btn_sound" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="156,206" size="113,0" group="n41_mk2u" visible="false">
+      <Button icon="ui://35sf1c1fjlv9su"/>
     </component>
-    <component id="n36_mk2u" name="btn_music" src="r05ec5" fileName="component/setting/Button4.xml" xy="246,287" size="580,58" group="n41_mk2u" visible="false"/>
-    <component id="n38_mk2u" name="slider_sound" src="r05e84" fileName="component/Main/setting/component/Slider1.xml" xy="261,234" size="479,61" group="n41_mk2u">
-      <Slider value="83" max="100"/>
+    <component id="n36_mk2u" name="btn_music" src="fxqa1q" fileName="component/setting/Button4.xml" pkg="2d9xdj6z" xy="160,208" size="113,0" group="n41_mk2u" visible="false"/>
+    <component id="n38_mk2u" name="slider_sound" src="jlv9sv" fileName="component/setting/setting/component/Slider1.xml" xy="294,303" size="347,45" group="n41_mk2u">
+      <Slider value="50" max="100"/>
     </component>
-    <text id="n39_mk2u" name="n39" xy="33,312" size="215,77" group="n41_mk2u" fontSize="46" color="#43633d" align="center" vAlign="middle" autoSize="none" text="音效:"/>
-    <text id="n40_mk2u" name="n40" xy="33,229" size="214,68" group="n41_mk2u" fontSize="46" color="#43633d" align="center" vAlign="middle" autoSize="none" text="音乐:"/>
-    <component id="n84_fgao" name="slider_music" src="r05e84" fileName="component/Main/setting/component/Slider1.xml" xy="264,333" size="479,63" group="n41_mk2u">
-      <Slider value="100" max="100"/>
+    <text id="n39_mk2u" name="n39" xy="67,377" size="177,54" group="n41_mk2u" font="ui://27vd145bpxed7ik2" fontSize="40" color="#0d1725" text="背景音乐:"/>
+    <text id="n40_mk2u" name="n40" xy="67,280" size="177,54" group="n41_mk2u" font="ui://27vd145bpxed7ik2" fontSize="40" color="#0d1725" text="游戏音效:"/>
+    <component id="n84_fgao" name="slider_music" src="jlv9sv" fileName="component/setting/setting/component/Slider1.xml" xy="316,458" size="347,45" group="n41_mk2u">
+      <Slider value="50" 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="r05e8q" fileName="component/Main/setting/images/setting/zipai_font_01.png" xy="284,799" group="n50_mk2u"/>
-    <image id="n45_mk2u" name="n45" src="r05e8r" 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="r05e8s" 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="r05e8t" fileName="component/Main/setting/images/setting/zipai_font_04.png" xy="637,799" group="n50_mk2u"/>
-    <component id="n59_mk2u" name="n59" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="218,800" size="163,110" group="n50_mk2u">
+    <group id="n41_mk2u" name="n41" xy="67,206" size="596,297" group="n58_mk2u" advanced="true"/>
+    <image id="n44_mk2u" name="n44" src="jlv9t2" fileName="component/setting/setting/images/setting/zipai_font_01.png" xy="212,384" size="72,90" group="n50_mk2u"/>
+    <image id="n45_mk2u" name="n45" src="jlv9t3" fileName="component/setting/setting/images/setting/zipai_font_02.png" xy="414,383" size="72,91" group="n50_mk2u"/>
+    <image id="n46_mk2u" name="n46" src="jlv9t4" fileName="component/setting/setting/images/setting/zipai_font_03.png" xy="605,383" size="71,89" group="n50_mk2u"/>
+    <image id="n47_mk2u" name="n47" src="jlv9t5" fileName="component/setting/setting/images/setting/zipai_font_04.png" xy="211,503" size="68,88" group="n50_mk2u"/>
+    <component id="n59_mk2u" name="n59" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="290,407" size="123,47" group="n50_mk2u">
       <Button checked="true" controller="cards" page="0"/>
     </component>
-    <component id="n60_mk2u" name="n60" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="469,830" size="71,47" group="n50_mk2u" visible="false">
+    <component id="n60_mk2u" name="n60" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="499,407" size="71,47" group="n50_mk2u">
       <Button controller="cards" page="1"/>
     </component>
-    <component id="n61_mk2u" name="n61" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="264,949" size="69,47" group="n50_mk2u" visible="false">
+    <component id="n61_mk2u" name="n61" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="683,406" size="69,47" group="n50_mk2u">
       <Button controller="cards" page="2"/>
     </component>
-    <component id="n62_mk2u" name="n62" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="567,801" size="169,110" group="n50_mk2u">
+    <component id="n62_mk2u" name="n62" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="290,526" size="123,47" group="n50_mk2u">
       <Button controller="cards" page="3"/>
     </component>
-    <group id="n50_mk2u" name="n50" xy="186,799" size="550,216" group="n58_mk2u" advanced="true">
+    <group id="n50_mk2u" name="n50" xy="211,383" size="541,208" group="n58_mk2u" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n66_mk2u" name="n66" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="217,1060" size="123,47" group="n54_mk2u">
+    <component id="n66_mk2u" name="n66" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="283,676" 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="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="570,1060" size="123,47" group="n54_mk2u">
+    <component id="n64_mk2u" name="n64" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="419,676" size="123,47" group="n54_mk2u">
       <Button title="中" titleColor="#5c3c16" titleFontSize="34" controller="size" page="1"/>
     </component>
-    <component id="n65_mk2u" name="n65" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="500,1059" size="123,47" group="n54_mk2u" visible="false">
+    <component id="n65_mk2u" name="n65" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="554,676" size="123,47" group="n54_mk2u">
       <Button title="小" titleColor="#5c3c16" titleFontSize="35" controller="size" page="2"/>
     </component>
-    <group id="n54_mk2u" name="n54" xy="217,1059" size="476,48" group="n58_mk2u" advanced="true">
+    <group id="n54_mk2u" name="n54" xy="283,676" size="394,47" group="n58_mk2u" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n67_mk2u" name="n67" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1149,622" size="214,57" group="n57_mk2u">
+    <component id="n67_mk2u" name="n67" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="307,831" size="214,57" group="n57_mk2u">
       <Button checked="true" title="方言" titleColor="#624720" titleFontSize="35" controller="fangyan" page="0"/>
     </component>
-    <component id="n68_mk2u" name="n68" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1354,622" size="214,57" group="n57_mk2u">
+    <component id="n68_mk2u" name="n68" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="512,831" size="214,57" group="n57_mk2u">
       <Button title="普通话" titleColor="#624720" titleFontSize="35" controller="fangyan" page="1"/>
     </component>
-    <group id="n57_mk2u" name="n57" xy="1149,622" size="419,57" group="n58_mk2u" advanced="true">
+    <group id="n57_mk2u" name="n57" xy="307,831" size="419,57" group="n58_mk2u" visible="false" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n73_ra9v" name="n73" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1373,1111" size="123,47" group="n76_ra9v">
+    <component id="n73_ra9v" name="n73" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="505,968" size="123,47" group="n76_ra9v">
       <Button checked="true" title="否" titleColor="#624720" titleFontSize="34" controller="yuyin" page="0"/>
     </component>
-    <component id="n74_ra9v" name="n74" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1495,1111" size="123,47" group="n76_ra9v">
+    <component id="n74_ra9v" name="n74" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="627,968" 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,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="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1373,1045" size="123,47" group="n77_ra9v">
+    <text id="n75_ra9v" name="n75" xy="242,968" size="208,47" group="n76_ra9v" fontSize="34" color="#5c3c16" text="禁止接收语音"/>
+    <group id="n76_ra9v" name="n76" xy="242,968" size="508,47" group="n78_ra9v"/>
+    <component id="n70_ra9v" name="n70" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="505,902" size="123,47" group="n77_ra9v">
       <Button checked="true" title="否" titleColor="#5c3c16" titleFontSize="34" controller="chupai" page="0"/>
     </component>
-    <component id="n71_ra9v" name="n71" src="r05ebq" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" xy="1495,1045" size="123,47" group="n77_ra9v">
+    <component id="n71_ra9v" name="n71" src="mk2u148" fileName="component/setting/component/setting/Btn_cr_checkbox.xml" pkg="v6yvqp7w" xy="627,902" 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,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">
+    <text id="n72_ra9v" name="n72" xy="242,906" size="208,47" group="n77_ra9v" fontSize="34" color="#5c3c16" text="开启快速吃牌"/>
+    <group id="n77_ra9v" name="n77" xy="242,902" size="508,47" group="n78_ra9v"/>
+    <group id="n78_ra9v" name="n78" xy="242,902" size="508,113" group="n58_mk2u" visible="false" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <image id="n83_fgao" name="n83" src="r05ec0" fileName="component/setting/images/newsetting/sx_img.png" xy="378,186" size="94,46" group="n58_mk2u">
+    <image id="n83_fgao" name="n83" src="r05ec0" fileName="component/setting/images/newsetting/sx_img.png" xy="382,99" size="180,34" group="n58_mk2u">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n85_fgao" name="n85" src="r05ec1" fileName="component/setting/images/newsetting/bj_img.png" xy="379,481" size="93,45" group="n58_mk2u">
+    <image id="n85_fgao" name="n85" src="r05ec1" fileName="component/setting/images/newsetting/bj_img.png" xy="382,289" size="180,33" group="n58_mk2u" visible="false">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n86_fgao" name="n86" src="r05ec2" fileName="component/setting/images/newsetting/pm_img.png" xy="379,724" size="93,45" group="n58_mk2u">
+    <image id="n86_fgao" name="n86" src="r05ec2" fileName="component/setting/images/newsetting/pm_img.png" xy="382,310" size="180,35" group="n58_mk2u">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n87_fgao" name="n87" src="r05ec3" fileName="component/setting/images/newsetting/sp_img.png" xy="379,985" size="92,45" group="n58_mk2u">
+    <image id="n87_fgao" name="n87" src="r05ec3" fileName="component/setting/images/newsetting/sp_img.png" xy="382,611" size="180,35" group="n58_mk2u">
       <relation target="" sidePair="center-center"/>
     </image>
-    <group id="n58_mk2u" name="panel_set" xy="-18,0" size="1714,1410" advanced="true"/>
-    <image id="n88_voqg" name="n88" src="r05ec7" fileName="component/setting/images/newsetting/gl_img.png" xy="356,974">
+    <image id="n88_voqg" name="n88" src="r05ec7" fileName="component/setting/images/newsetting/gl_img.png" xy="390,974" group="n58_mk2u" visible="false">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n79_fgao" name="n79" src="r05ebx" fileName="component/setting/images/newsetting/szbt_img.png" xy="285,8" size="315,74" group="n81_fgao" visible="false"/>
-    <image id="n80_fgao" name="n80" src="r05eby" fileName="component/setting/images/newsetting/szz_img.png" xy="354,60" size="154,75" group="n81_fgao"/>
-    <group id="n81_fgao" name="n81" xy="285,8" size="315,127" advanced="true">
+    <group id="n58_mk2u" name="panel_set" xy="0,2" size="919,1013" advanced="true"/>
+    <image id="n80_fgao" name="n80" src="r05eby" fileName="component/setting/images/newsetting/szz_img.png" xy="370,47" group="n81_fgao"/>
+    <group id="n81_fgao" name="n81" xy="370,47" size="179,87" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

fk101/wb_new_ui/assets/Main_RunBeard/component/setting/setting/component/Slider1.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="473,50" extention="Slider">
+  <displayList>
+    <image id="n4_fgao" name="n4" src="r05ebv" fileName="component/setting/images/newsetting/hdtd_img.png" xy="0,0"/>
+    <image id="n5_fgao" name="bar" src="r05ebw" fileName="component/setting/images/newsetting/jdt_img.png" xy="0,0"/>
+    <component id="n3" name="grip" src="jlv9sy" fileName="component/setting/setting/component/Slider1_grip.xml" xy="495,-6">
+      <relation target="n5_fgao" sidePair="right-right"/>
+    </component>
+  </displayList>
+  <Slider/>
+</component>

fk101/wb_new_ui/assets/Main_RunBeard/component/setting/setting/component/Slider1_grip.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="63,65" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n1" name="n1" src="jlv9sz" fileName="component/Main/setting/images/setting/sytb.png" xy="-1,-3" visible="false"/>
+    <image id="n2_fgao" name="n2" src="r05e83" fileName="component/setting/images/newsetting/sytb_img.png" xy="0,0" visible="false"/>
+  </displayList>
+  <Button/>
+</component>

fk101/wb_new_ui/assets/Main_RunBeard/component/setting/setting/component/setting/btn_bg.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="155,68" overflow="hidden" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <displayList>
+    <graph id="n5_pue4" name="n5" xy="1,0" size="153,68" type="rect" lineColor="#4d000000" fillColor="#4d000000" corner="6"/>
+    <image id="n1" name="n1" src="pue4a6" fileName="component/setting/changeBG/b01.png" pkg="2d9xdj6z" xy="4,3" size="147,62">
+      <relation target="" sidePair=""/>
+    </image>
+    <loader id="n2" name="icon" xy="4,3" size="50,30">
+      <relation target="" sidePair=""/>
+    </loader>
+    <image id="n4_pue4" name="n4" src="jlv9t1" fileName="component/Main/setting/images/setting/xzk.png" xy="0,-2" visible="false">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n6_a46z" name="n6" src="r05e7x" fileName="component/setting/images/newsetting/szgx_img.png" xy="0,-2">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>