update

lua_probject/base_project/Game/View/NewGroup/GroupInfoView.lua

@@ -1067,17 +1067,18 @@ function M:InitView(url)
 
     -- self._view:GetChild('player_diamond').text = self.curGroup.diamo
     local btn_refreshbg = self._view:GetChild("btn_refreshbg").onClick:Set(function()
-        if self._view:GetController("bgchange").selectedIndex == 0 then
+        if self._view:GetController("bgchange").selectedIndex < 2 then
-            Utils.SaveLocalFile(DataManager.SelfUser.account_id .. "bgflag", 2)
+            Utils.SaveLocalFile(DataManager.SelfUser.account_id .. "bgflag", self._view:GetController("bgchange").selectedIndex+1)
-            self._view:GetController("bgchange").selectedIndex = 1
+            printlog(self._view:GetController("bgchange").selectedIndex)
+            self._view:GetController("bgchange").selectedIndex = self._view:GetController("bgchange").selectedIndex+1
         else
-            Utils.SaveLocalFile(DataManager.SelfUser.account_id .. "bgflag", 1)
+            Utils.SaveLocalFile(DataManager.SelfUser.account_id .. "bgflag", 0)
             self._view:GetController("bgchange").selectedIndex = 0
         end
     end)
 
-    if Utils.LoadLocalFile(DataManager.SelfUser.account_id .. "bgflag") == "2" then
+    if Utils.LoadLocalFile(DataManager.SelfUser.account_id .. "bgflag")  then
-        self._view:GetController("bgchange").selectedIndex = 1
+        self._view:GetController("bgchange").selectedIndex = Utils.LoadLocalFile(DataManager.SelfUser.account_id .. "bgflag") 
     else
         self._view:GetController("bgchange").selectedIndex = 0
     end

lua_probject/extend_project/extend/majiang/hongzhong/EXPlayBackView.lua

@@ -141,6 +141,7 @@ function M:ShowStep(index)
 	if step.cmd == Record_Event.Evt_Result then
 		if not self.result then
 			self.result = EXClearingView.new(self._root_view, true)
+			
 			self.result:InitData(0, self._room, step.result_data)
 			self.result._view.x = (GRoot.inst.width - self.result._view.width) * -0.5
 			self.result._view.width = GRoot.inst.width
@@ -152,7 +153,7 @@ function M:ShowStep(index)
 		else
 			self.result._view.visible = true
 		end
-		-- self.result._view:Center()
+		 self.result._view:Center()
 	else
 		if self.result then
 			self.result._view.visible = false

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

@@ -664,6 +664,7 @@ function M:__FangziTip(tip, _uid, fptype)
     local count = #_tlist
     local zdhu = false
     local fpao = true
+    
     for k = 1, #_tlist do
         local td = tip.tip_map_type[_tlist[k]][1]
         if td.type == 8 then
@@ -686,7 +687,7 @@ function M:__FangziTip(tip, _uid, fptype)
         self._chipeng_tip = nil
         return
     end
-
+    
     for k = 1, #_tlist do
         local td = tip.tip_map_type[_tlist[k]][1]
         local url = 'ui://Main_RunBeard/Btn_fztip'
@@ -740,7 +741,7 @@ function M:__TipAction(context)
     local td = data[2]
     local tip_hu = data[3]
     local list = tip.tip_map_type[td.weight]
-
+ 
     if (#list > 1) or td.type == 1 then
         local chiflag = true
         for key, value in pairs(list) do
@@ -751,7 +752,7 @@ function M:__TipAction(context)
         if #list > 1 then
             chiflag = false
         end
-        if chiflag then
+        if tip_hu==false and chiflag then
             _gamectr:SendAction(list[1]["id"])
             self:__CloseTip()
             local info = self._player_card_info[1]
@@ -783,6 +784,8 @@ function M:__TipAction(context)
                 end
             end
         )
+
+         
         -- self._chipeng_tip.visible = false
         return
     end
@@ -1029,6 +1032,7 @@ function M:OnFangziAction(...)
             --  effect:GetChild("icon2").icon = UIPackage.GetItemURL("Extend_Poker_FanPaoFa", "chouwei")
             self:PlaySound(player.self_user.sex, 'F_GuoSao')
             effect:GetChild('icon1').icon = UIPackage.GetItemURL('Extend_Poker_FanPaoFa', 'chouwei')
+
         elseif fz.type == RB_FZType.Pao then
             --  effect:GetChild("icon2").icon = UIPackage.GetItemURL("Main_RunBeard", "pao")
             self:PlaySound(player.self_user.sex, 'F_KaiDuo')
@@ -1045,7 +1049,7 @@ function M:OnFangziAction(...)
         pNode:AddChild(effect)
         coroutine.start(
             function()
-                coroutine.wait(3)
+                coroutine.wait(0.5)
                 effect:Dispose()
             end
         )

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

@@ -164,8 +164,6 @@ function M:ShowStep(index)
     self._lit_fanzi = _chipeng_tip:GetChild('lit_fanzi')
     self._lit_fanzi:RemoveChildrenToPool()
 
-    printlog("lingmeng ShowStep", self._step[index + 1].cmd)
-    pt(self._step[index + 1])
     for i = 1, #step.player_card_data do
         local p = self._room:GetPlayerBySeat(i)
         local info = self._player_card_info[self:GetPos(i)]
@@ -201,10 +199,6 @@ function M:ShowStep(index)
 
         if index > 1 then
             for k, v in pairs(self.CheckServerErrorList) do
-                ----printlog("k===>>>",k)
-                ----printlog("v===>>>",v)
-                ----printlog(k,index)
-                --pt(p.card_list)
                 if tonumber(index + 1) > tonumber(k) then
                     list_remove(p.card_list, v)
                 end

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

@@ -14,7 +14,7 @@ function ExtendConfig.new()
     setmetatable(M, { __index = IExtendConfig })
     local self = setmetatable({}, { __index = M })
     self.class = 'ExtendConfig'
-    self.extend_id = 13
+    self.extend_id = 17
     self._viewMap = {}
     self._viewMap[ViewManager.View_Main] = EXMainView
     self._viewMap[ViewManager.View_PlayBack] = EXPlayBackView
@@ -59,8 +59,6 @@ function M:FillRoomData(s2croom)
     local _tableInfo = s2croom['tableInfo']
 
     local _config = _tableInfo['config']
-    --printlog("FillRoomConfig:")
-    pt(_config)
     room.room_config = EXRoomConfig.new(_config)
 
     local playerList = _tableInfo['playerData']

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

@@ -741,10 +741,10 @@ function M:FillItemData(room, data, item)
                 local cards = card_list:AddItemFromPool()
                 cards:GetChild('card_type').text = '将'
                 cards:GetChild('card_huxi').text = win_data.opCardList[i].hu_xi
-                cards:GetController('c1').selectedIndex = 1
+                cards:GetController('c1').selectedIndex = 0
                 if win_data.opCardList[i].card1 == win_data.win_card and isWin_Card == true then
                     isWin_Card = false
-                    cards:GetController('hu').selectedIndex = 1
+                    cards:GetController('hu').selectedIndex = 0
                 end
                     cards:GetChild('card_1').icon =
                         self:getCardItem('ui://Main_RunBeard/202_', win_data.opCardList[i].card1)

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

@@ -151,12 +151,12 @@ function M:playAnim(fzitem,fzcards, size,i,ispaly,seat)
          if(seat~=nil)then
          isaddLast = self:isAddFirst(seat)
          end
-         if(isaddLast)then
+       --  if(isaddLast)then
          local index_postion = 0
          self._area_fz_list:AddChildAt(fzitem,index_postion)
-         else
+        -- else
-         self._area_fz_list:AddChild(fzitem)
+        -- self._area_fz_list:AddChild(fzitem)
-         end
+        -- end
 end
 
 function M:isAddFirst(seat)

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

@@ -45,7 +45,6 @@ function M:__OnDragEnd(context)
   
     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
         button.touchable = false
         self.outcard_button = card

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

@@ -90,6 +90,7 @@ end
 
  --放字 
 function M:UpdateFzList( fz_list )
+    printlog("UpdateFzList----")
     self._area_fz_list:RemoveChildren(0,-1,true)
     for i = 1,#fz_list do
         local fzitem = nil

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

@@ -358,6 +358,7 @@ end
 
 --  --
 function M:onTouchBegin(context)
+    printlog("onTouchBegin")
     if DataManager.CurrenRoom == nil or DataManager.CurrenRoom.self_player == nil then
         return
     end
@@ -367,9 +368,10 @@ function M:onTouchBegin(context)
         self:ShowHuTip(card.card_item)
     end
     card.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/203_', card.card_item)
-    -- card.btn_card.sortingOrder = 100
+    card.btn_card.sortingOrder = 100
+
     local xy = self._area_handcard_list:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
-    card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 50)
+    card.btn_card.xy = Vector2.New(card.btn_card.x + 20, card.btn_card.y - 30)
     card.touch_pos = xy - button.xy
 end
 
@@ -459,7 +461,7 @@ function M:UpdateHandCardsPos()
         card_view.btn_card:RemoveFromParent()
         self._area_handcard_list:AddChild(card_view.btn_card)
         card_view.old_postion = self:GetHandCardPos(card_view, #CountCards)
-        card_view.btn_card:TweenMove(card_view.old_postion, 0.3)
+        card_view.btn_card:TweenMove(card_view.old_postion, 0.6)
     end
     self:ShowHuTip()
 end
@@ -476,7 +478,7 @@ function M:UpdateCardDisplay()
         card_view.btn_card:RemoveFromParent()
         card_view.btn_card:GetChild('icon').icon = self:getCardItem('ui://Main_RunBeard/201_', card_view.card_item)
         self._area_handcard_list:AddChild(card_view.btn_card)
-        card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.3)
+        card_view.btn_card:TweenMove(self:GetHandCardPos(card_view, #CountCards), 0.5)
     end
 end
 

wb_new_ui/.objs/metas/m7iejg46/hwww2f.info

@@ -1,5 +1,11 @@
 {
   "objectStatus": {
+    "n9_m1dc": {
+      "hidden": true
+    },
+    "n8_m1dc": {
+      "hidden": true
+    },
     "n12_quwh": {
       "hidden": true
     },
@@ -9,10 +15,10 @@
     "n11_rfcn": {
       "hidden": true
     },
-    "n9_m1dc": {
+    "n13_ilon": {
       "hidden": true
     },
-    "n8_m1dc": {
+    "n16_kt8n": {
       "hidden": true
     }
   }

wb_new_ui/.objs/workspace.json

@@ -1,5 +1,5 @@
 {
-  "libview.firstColumnWidth": 522,
+  "libview.firstColumnWidth": 297,
   "expanded_nodes": [
     "27vd145b",
     "/",
@@ -28,13 +28,17 @@
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://2d9xdj6zfn7fao",
+  "doc.activeDoc": "ui://v6yvqp7wf55qw5",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "2d9xdj6z",
     "/",
-    "m7iejg46",
+    "v6yvqp7w",
-    "/"
+    "/",
+    "v6yvqp7w",
+    "/component/",
+    "v6yvqp7w",
+    "/component/Main/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/clearing.xml

@@ -24,10 +24,10 @@
       <gearDisplay controller="button" pages="1"/>
       <Button icon="ui://v6yvqp7wn1ry3r"/>
     </component>
-    <text id="n14_pt1r" name="n14" xy="62,2" size="92,32" group="n19_pt1r" fontSize="22" color="#ffffff" align="center" vAlign="middle" text="房间号："/>
+    <text id="n14_pt1r" name="n14" xy="62,2" size="92,31" group="n19_pt1r" fontSize="22" color="#ffffff" align="center" vAlign="middle" text="房间号："/>
     <text id="n15_pt1r" name="tex_roomnum" xy="166,1" size="76,41" group="n19_pt1r" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="123456&#xA;"/>
-    <text id="n16_pt1r" name="tex_game" xy="916,9" size="114,32" group="n19_pt1r" fontSize="22" color="#ffffff" vAlign="middle" text="娄底放炮罚"/>
+    <text id="n16_pt1r" name="tex_game" xy="916,9" size="114,31" group="n19_pt1r" fontSize="22" color="#ffffff" vAlign="middle" text="娄底放炮罚"/>
-    <text id="n17_pt1r" name="tex_data" xy="1106,3" size="150,39" group="n19_pt1r" fontSize="28" color="#b25116" align="center" vAlign="middle" text="2017-02-12"/>
+    <text id="n17_pt1r" name="tex_data" xy="1106,3" size="145,39" group="n19_pt1r" fontSize="28" color="#b25116" align="center" vAlign="middle" text="2017-02-12"/>
     <group id="n19_pt1r" name="room_info" xy="62,1" size="1189,41" group="n70_dunj"/>
     <text id="n49_g8y2" name="n49" xy="475,600" size="457,74" group="n70_dunj" visible="false" fontSize="18" color="#999999" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
       <gearDisplay controller="over" pages="1"/>
@@ -103,7 +103,7 @@
       <item/>
     </list>
     <text id="n42_n1ry" name="score" xy="986,364" size="256,42" group="n45_n1ry" fontSize="30" color="#924e00" vAlign="middle" autoSize="none" bold="true" singleLine="true" text=""/>
-    <text id="n56_fnpw" name="222" xy="767,567" size="82,36" group="n58_fnpw" fontSize="26" color="#b25116" vAlign="middle" text="弃牌："/>
+    <text id="n56_fnpw" name="222" xy="767,567" size="82,37" group="n58_fnpw" fontSize="26" color="#b25116" vAlign="middle" text="弃牌："/>
     <list id="n62_fnpw" name="qipai_list" xy="955,479" size="298,157" group="n58_fnpw" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
       <item/>
       <item/>
@@ -149,7 +149,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n53_rx2e" name="card_list_2" xy="537,179" pivot="0.5,0.5" size="261,198" group="n55_rx2e" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
+    <list id="n53_rx2e" name="card_list_2" xy="537,179" pivot="0.5,0.5" size="261,198" group="n55_rx2e" visible="false" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" vAlign="middle">
       <item/>
       <item/>
       <item/>

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

@@ -3,7 +3,7 @@
   <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="0"/>
+  <controller name="niao" pages="0,,1," selected="1"/>
   <displayList>
     <list id="n36_lr5d" name="windcard_list" xy="1331,215" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wlr5d31">
       <relation target="" sidePair="right-right"/>
@@ -52,13 +52,13 @@
       <Button icon="ui://v6yvqp7wj34t1go" selectedIcon="ui://v6yvqp7wj34t1go" controller="piaovalue" page="5"/>
     </component>
     <group id="n45_j34t" name="piao" xy="226,-126" size="949,103"/>
-    <component id="n46_cphv" name="daniao" src="99we1h1" fileName="component/niao/btn_niao.xml" xy="180,-232" group="n48_cphv">
+    <component id="n46_cphv" name="daniao" src="99we1h1" fileName="component/niao/btn_niao.xml" xy="245,-205" group="n48_cphv">
       <gearDisplay controller="niao" pages="1"/>
     </component>
-    <component id="n47_cphv" name="budaniao" src="99we1h2" fileName="component/niao/btn_noniao.xml" xy="904,-234" group="n48_cphv">
+    <component id="n47_cphv" name="budaniao" src="99we1h2" fileName="component/niao/btn_noniao.xml" xy="839,-209" group="n48_cphv">
       <gearDisplay controller="niao" pages="1"/>
     </component>
-    <group id="n48_cphv" name="niao" xy="180,-234" size="974,92" advanced="true">
+    <group id="n48_cphv" name="niao" xy="245,-209" size="844,94" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,750" opaque="false" initName="player_card_info">
   <displayList>
-    <list id="n47_lr5d" name="area_fz_list" xy="11,2" pivot="0.5,0.5" size="465,173" rotation="180" layout="row" scroll="horizontal" colGap="5" defaultItem="ui://v6yvqp7wyxjj19a" align="right" vAlign="bottom"/>
+    <list id="n47_lr5d" name="area_fz_list" xy="35,4" pivot="0.5,0.5" size="431,173" rotation="180" layout="row" scroll="horizontal" colGap="5" align="right" vAlign="bottom"/>
     <list id="n48_lr5d" name="windcard_list" xy="16,196" size="280,78" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw" vAlign="bottom"/>
     <component id="n50_n1ry" name="mask_liangpai" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="200,83" size="5,5"/>
     <component id="n25" name="area_outcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="322,19" size="67,182" touchable="false"/>
-    <component id="n51_n7o4" name="area_handcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="176,86" size="300,175" touchable="false"/>
+    <component id="n51_n7o4" name="area_handcard_list" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="214,104" size="300,175" touchable="false"/>
   </displayList>
   <transition name="t0">
     <item time="0" type="XY" target="n25" tween="true" startValue="-63,105" endValue="121.45,295" duration="4"/>

wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -14,14 +14,18 @@
   </controller>
   <controller name="show_search" pages="0,,1," selected="0"/>
   <controller name="more" pages="0,,1," selected="0"/>
-  <controller name="bgchange" pages="0,,1," selected="0"/>
+  <controller name="bgchange" pages="0,,1,,3,,4," selected="1"/>
   <displayList>
+    <image id="n269_kt8n" name="n269" src="kt8n7ij6" fileName="image 152.png" xy="0,0">
+      <gearDisplay controller="bgchange" pages="3"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <image id="n231_csp4" name="n231" src="csp47cn9" fileName="images/bj.png" pkg="2d9xdj6z" xy="0,0" size="1343,750" color="#e1e1e1">
-      <gearDisplay controller="bgchange" pages="0"/>
+      <gearDisplay controller="bgchange" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n266_nunk" name="n266" src="nunk7iix" fileName="images/bg2.png" xy="0,0" size="1343,750">
-      <gearDisplay controller="bgchange" pages="1"/>
+      <gearDisplay controller="bgchange" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <image id="n245_ilon" name="n245" src="n6w87i9h" fileName="images/Rectangle 9.png" xy="0,1" size="1334,120">
@@ -119,7 +123,7 @@
     <image id="n248_ilon" name="n248" src="ilon7i9j" fileName="Rectangle 13.png" xy="261,46" size="212,69" group="n206_jvvo">
       <relation target="" sidePair="left-left,top-top"/>
     </image>
-    <text id="n251_ilon" name="tex_hp_title" xy="273,49" size="76,32" group="n206_jvvo" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" bold="true" text="疲劳值:">
+    <text id="n251_ilon" name="tex_hp_title" xy="273,49" size="76,31" group="n206_jvvo" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" bold="true" text="疲劳值:">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <text id="n250_ilon" name="tex_fag" xy="355,49" size="113,32" group="n206_jvvo" font="Microsoft YaHei" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="A79B17">
@@ -134,7 +138,7 @@
     <text id="n205_jvvo" name="tex_hp" xy="344,80" size="113,32" group="n206_jvvo" font="Microsoft YaHei" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" bold="true" text="7">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <text id="n216_ovii" name="n216" xy="221,-77" size="94,42" group="n206_jvvo" visible="false" font="Microsoft YaHei" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
+    <text id="n216_ovii" name="n216" xy="221,-77" size="94,41" group="n206_jvvo" visible="false" font="Microsoft YaHei" fontSize="30" color="#ffffff" vAlign="middle" text="积分：">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <image id="n229_csp4" name="n229" src="csp47i3u" fileName="images/room/jifen.png" xy="237,-61" group="n206_jvvo" visible="false"/>
@@ -142,7 +146,7 @@
     <text id="n253_ilon" name="tex_id" xy="90,53" size="158,39" group="n78_i7lq" font="Microsoft YaHei" fontSize="28" color="#ffffff" vAlign="middle" autoSize="shrink" bold="true" text="老司机带带我">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
-    <text id="n254_ilon" name="tex_tableNum" xy="90,87" size="136,32" group="n78_i7lq" font="Microsoft YaHei" fontSize="22" color="#ffffff" vAlign="middle" bold="true" text="老司机带带我">
+    <text id="n254_ilon" name="tex_tableNum" xy="90,87" size="136,31" group="n78_i7lq" font="Microsoft YaHei" fontSize="22" color="#ffffff" vAlign="middle" bold="true" text="老司机带带我">
       <relation target="" sidePair="left-left,top-top"/>
     </text>
     <group id="n78_i7lq" name="title" xy="90,11" size="158,108" group="n176_mn85" advanced="true"/>
@@ -163,7 +167,7 @@
       <Button icon="ui://m7iejg46cioehoj"/>
     </component>
     <group id="n175_mn85" name="n175" xy="858,4" size="54,55"/>
-    <list id="n45_l0s4" name="lst_room" xy="56,144" size="1221,492" layout="flow_hz" selectionMode="none" overflow="scroll" scrollBarFlags="2" lineGap="5" colGap="60" defaultItem="ui://m7iejg46ilon7i9l" align="center" autoClearItems="true">
+    <list id="n45_l0s4" name="lst_room" xy="56,145" size="1221,503" layout="flow_hz" selectionMode="none" overflow="scroll" scrollBarFlags="2" lineGap="5" colGap="60" defaultItem="ui://m7iejg46ilon7i9l" align="center" autoClearItems="true">
       <gearDisplay controller="null" pages="0"/>
       <relation target="" sidePair="width-width%,center-center,middle-middle"/>
       <item/>
@@ -187,7 +191,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n122_gg9f" name="lst_layer" xy="17,665" size="1090,80" layout="row" overflow="scroll" scroll="horizontal" lineGap="1" colGap="13" defaultItem="ui://m7iejg46jiu8hef" align="center" autoClearItems="true">
+    <list id="n122_gg9f" name="lst_layer" xy="17,665" size="1090,80" layout="row" overflow="scroll" scroll="horizontal" lineGap="1" colGap="13" defaultItem="ui://m7iejg46jiu8hef" vAlign="middle" autoClearItems="true">
       <gearDisplay controller="search" pages="0"/>
       <relation target="" sidePair="width-width%,height-height%,bottom-bottom"/>
       <item/>

wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk1.xml

@@ -6,8 +6,8 @@
     <loader id="n12_n96g" name="ldr_table" xy="22,9" size="52,52" visible="false" url="ui://m7iejg46vyn37i5d">
       <gearIcon controller="color" pages="0,1,2,3,4,5,6,7" values="ui://m7iejg46vyn37i5d|ui://m7iejg46vyn37i5e|ui://m7iejg46vyn37i5f|ui://m7iejg46irlqhze|ui://m7iejg46irlqhzd|ui://m7iejg46irlqhzc|ui://m7iejg46irlqhzb|ui://m7iejg46irlqhza"/>
     </loader>
-    <component id="n10_10snh" name="head1" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="0,0" touchable="false"/>
+    <component id="n10_10snh" name="head1" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="20,36" touchable="false"/>
-    <component id="n7_10snh" name="head2" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="196,122" aspect="true" touchable="false"/>
+    <component id="n7_10snh" name="head2" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="179,127" aspect="true" touchable="false"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk2.xml

@@ -6,8 +6,8 @@
     <loader id="n12_n96g" name="ldr_table" xy="22,9" size="52,52" visible="false" url="ui://m7iejg46vyn37i5d">
       <gearIcon controller="color" pages="0,1,2,3,4,5,6,7" values="ui://m7iejg46vyn37i5d|ui://m7iejg46vyn37i5e|ui://m7iejg46vyn37i5f|ui://m7iejg46irlqhze|ui://m7iejg46irlqhzd|ui://m7iejg46irlqhzc|ui://m7iejg46irlqhzb|ui://m7iejg46irlqhza"/>
     </loader>
-    <component id="n10_10snh" name="head1" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="0,0" touchable="false"/>
+    <component id="n10_10snh" name="head1" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="17,22" touchable="false"/>
-    <component id="n7_10snh" name="head2" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="196,132" aspect="true" touchable="false"/>
+    <component id="n7_10snh" name="head2" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="189,132" aspect="true" touchable="false"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_Play_desk3.xml

@@ -6,8 +6,8 @@
     <loader id="n12_n96g" name="ldr_table" xy="22,9" size="52,52" visible="false" url="ui://m7iejg46vyn37i5d">
       <gearIcon controller="color" pages="0,1,2,3,4,5,6,7" values="ui://m7iejg46vyn37i5d|ui://m7iejg46vyn37i5e|ui://m7iejg46vyn37i5f|ui://m7iejg46irlqhze|ui://m7iejg46irlqhzd|ui://m7iejg46irlqhzc|ui://m7iejg46irlqhzb|ui://m7iejg46irlqhza"/>
     </loader>
-    <component id="n10_10snh" name="head1" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="0,0" touchable="false"/>
+    <component id="n10_10snh" name="head1" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="18,29" touchable="false"/>
-    <component id="n7_10snh" name="head2" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="178,108" aspect="true" touchable="false"/>
+    <component id="n7_10snh" name="head2" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="176,129" aspect="true" touchable="false"/>
   </displayList>
   <Button downEffect="dark" downEffectValue=".8"/>
 </component>

wb_new_ui/assets/NewGroup/component/Lst_room/Gcm_head.xml

@@ -2,23 +2,25 @@
 <component size="66,66" extention="Button">
   <controller name="offline" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n13_ilon" name="n13" src="ilon7i9v" fileName="images/room/Rectangle 43.png" xy="0,0">
+    <image id="n13_ilon" name="n13" src="ilon7i9v" fileName="images/room/Rectangle 43.png" xy="0,0" visible="false">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n8_m1dc" name="n8" src="m1dchyn" fileName="images/room/touxiang.png" xy="0,-2" aspect="true" visible="false"/>
+    <image id="n16_kt8n" name="n16" src="kt8n7ij8" fileName="images/room/Rectangle 441.png" xy="0,0" size="65,65"/>
+    <image id="n8_m1dc" name="n8" src="m1dchyn" fileName="images/room/touxiang.png" xy="-8,-8" size="85,85" aspect="true" visible="false"/>
     <component id="n1_hwww" name="btn_head" src="ltr0hqw" fileName="component/Lst_room/Head.xml" xy="3,3" size="60,60" aspect="true">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <image id="n9_m1dc" name="n9" src="m1dchyo" fileName="images/room/text_btn.png" xy="-13,111" size="109,39" group="n10_m1dc" visible="false"/>
-    <text id="n2_yh61" name="tex_name" xy="-6,70" size="79,22" group="n10_m1dc" font="Microsoft YaHei" fontSize="14" color="#ffffff" align="center" bold="true" strokeColor="#764900" text="玩家名字的">
+    <text id="n11_rfcn" name="tex_id" xy="-13,132" size="104,27" group="n10_m1dc" visible="false" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" autoSize="height" text="玩家名字的"/>
+    <text id="n12_quwh" name="tex_score" xy="-13,111" size="104,23" group="n10_m1dc" visible="false" font="Microsoft YaHei" fontSize="15" color="#ffffff" align="center" autoSize="shrink" text=""/>
+    <image id="n15_kt8n" name="n15" src="kt8n7ij7" fileName="component/Lst_room/Rectangle 432.png" xy="-13,68" size="92,26" group="n10_m1dc" alpha="0.5"/>
+    <text id="n2_yh61" name="tex_name" xy="-21,67" size="102,26" group="n10_m1dc" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" autoSize="none" bold="true" strokeColor="#764900" text="玩家名字的">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n11_rfcn" name="tex_id" xy="-13,132" size="104,26" group="n10_m1dc" visible="false" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" autoSize="height" text="玩家名字的"/>
+    <group id="n10_m1dc" name="n10" xy="-21,67" size="117,91"/>
-    <text id="n12_quwh" name="tex_score" xy="-13,111" size="104,23" group="n10_m1dc" visible="false" font="Microsoft YaHei" fontSize="15" color="#ffffff" align="center" autoSize="shrink" text=""/>
-    <group id="n10_m1dc" name="n10" xy="-13,70" size="109,88"/>
     <graph id="n4_nyna" name="n4" xy="7,6" size="47,47" group="n7_nyna" alpha="0.7" type="eclipse" fillColor="#ff000000" corner="7"/>
-    <text id="n5_nyna" name="n5" xy="12,9" size="40,26" group="n7_nyna" fontSize="18" color="#ffffff" text="离线"/>
+    <text id="n5_nyna" name="n5" xy="12,9" size="40,27" group="n7_nyna" fontSize="18" color="#ffffff" text="离线"/>
-    <text id="n6_nyna" name="tex_time" xy="5,29" pivot="0.5,0.5" size="47,24" group="n7_nyna" fontSize="16" color="#ffffff" autoClearText="true" text="100秒"/>
+    <text id="n6_nyna" name="tex_time" xy="5,29" pivot="0.5,0.5" size="46,24" group="n7_nyna" fontSize="16" color="#ffffff" autoClearText="true" text="100秒"/>
     <group id="n7_nyna" name="n7" xy="7,6" size="50,47" advanced="true">
       <gearDisplay controller="offline" pages="1"/>
     </group>

wb_new_ui/assets/NewGroup/component/Lst_room/Head.xml

@@ -4,7 +4,7 @@
     <loader id="n1" name="icon" xy="0,0" size="66,66" url="ui://27vd145bklso1c" align="center" vAlign="middle" fill="scale">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
-    <graph id="n2_licj" name="n2" xy="0,0" size="66,66" aspect="true" type="rect" lineSize="0">
+    <graph id="n2_licj" name="n2" xy="0,0" size="66,66" aspect="true" type="eclipse" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
   </displayList>

wb_new_ui/assets/NewGroup/component/Lst_room/Play_room1.xml

@@ -2,21 +2,21 @@
 <component size="270,240" extention="Button">
   <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n42_10snh" name="desk" src="ilon7i9m" fileName="component/Lst_room/Gcm_Play_desk1.xml" xy="3,24"/>
+    <component id="n42_10snh" name="desk" src="ilon7i9m" fileName="component/Lst_room/Gcm_Play_desk1.xml" xy="3,-1"/>
-    <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="101,167" size="104,98" scale="0.7,0.7" visible="false">
+    <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="101,179" size="104,98" scale="0.7,0.7" visible="false">
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
     </component>
-    <text id="n53_n96g" name="tex_round" xy="69,108" size="135,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" autoClearText="true" text="8/1">
+    <text id="n53_n96g" name="tex_round" xy="69,107" size="135,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" autoClearText="true" text="8/1">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n52_n96g" name="tex_gamename" xy="23,76" size="215,35" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="shrink" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
+    <text id="n52_n96g" name="tex_gamename" xy="23,75" size="215,35" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="shrink" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n54_hugj" name="tex_limit" xy="123,142" size="28,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
+    <text id="n54_hugj" name="tex_limit" xy="123,141" size="28,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <image id="n56_ilon" name="n56" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="119,139">
+    <image id="n56_ilon" name="n56" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="119,138">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
   </displayList>

wb_new_ui/assets/NewGroup/component/Lst_room/Play_room2.xml

@@ -2,23 +2,23 @@
 <component size="270,240" extention="Button">
   <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n42_10snh" name="desk" src="iaes7idj" fileName="component/Lst_room/Gcm_Play_desk2.xml" xy="3,22" size="270,240"/>
+    <component id="n42_10snh" name="desk" src="iaes7idj" fileName="component/Lst_room/Gcm_Play_desk2.xml" xy="0,0" size="270,240"/>
-    <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="101,166" size="104,126" scale="0.7,0.7" visible="false">
+    <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="98,144" size="104,126" scale="0.7,0.7" visible="false">
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
     </component>
-    <text id="n53_n96g" name="tex_round" xy="79,103" size="116,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" autoClearText="true" text="8/1">
+    <text id="n53_n96g" name="tex_round" xy="76,102" size="116,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" autoClearText="true" text="8/1">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="n58_ufim" sidePair="top-bottom"/>
     </text>
-    <text id="n58_ufim" name="tex_gamename" xy="34,70" size="207,34" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
+    <text id="n58_ufim" name="tex_gamename" xy="31,69" size="207,34" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
       <relation target="" sidePair="center-center,top-top%"/>
     </text>
-    <text id="n54_hugj" name="tex_limit" xy="123,139" size="28,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
+    <text id="n54_hugj" name="tex_limit" xy="117,138" size="28,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="n60_ufim" sidePair="center-center,middle-middle"/>
     </text>
-    <image id="n60_ufim" name="n60" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="119,134">
+    <image id="n60_ufim" name="n60" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="116,133">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
   </displayList>

wb_new_ui/assets/NewGroup/component/Lst_room/Play_room3.xml

@@ -2,23 +2,23 @@
 <component size="270,240" extention="Button">
   <controller name="state" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n42_10snh" name="desk" src="iaes7idk" fileName="component/Lst_room/Gcm_Play_desk3.xml" xy="3,24" size="250,221"/>
+    <component id="n42_10snh" name="desk" src="iaes7idk" fileName="component/Lst_room/Gcm_Play_desk3.xml" xy="3,2" size="264,242"/>
-    <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="90,166" size="104,126" scale="0.7,0.7" visible="false">
+    <component id="n55_vena" name="btn_detail" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="90,144" size="104,126" scale="0.7,0.7" visible="false">
       <relation target="" sidePair="center-center%"/>
       <Button title=" " icon="ui://m7iejg46h60mhyq"/>
     </component>
-    <text id="n57_ufim" name="tex_round" xy="60,108" size="149,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" autoClearText="true" text="8/1">
+    <text id="n57_ufim" name="tex_round" xy="58,112" size="149,32" font="Microsoft YaHei" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" autoClearText="true" text="8/1">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="n58_ufim" sidePair="top-bottom"/>
     </text>
-    <text id="n58_ufim" name="tex_gamename" xy="30,69" size="204,35" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
+    <text id="n58_ufim" name="tex_gamename" xy="28,73" size="204,35" font="Microsoft YaHei" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="none" bold="true" strokeColor="#053691" autoClearText="true" text="红中麻将">
       <relation target="" sidePair="center-center,top-top%"/>
     </text>
-    <text id="n59_ufim" name="tex_limit" xy="129,151" size="15,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="0">
+    <text id="n59_ufim" name="tex_limit" xy="127,155" size="15,27" font="Microsoft YaHei" fontSize="18" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="0">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="n60_ufim" sidePair="top-top"/>
     </text>
-    <image id="n60_ufim" name="n60" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="119,145">
+    <image id="n60_ufim" name="n60" src="ilon7i9w" fileName="images/room/Ellipse 13.png" xy="117,149">
       <relation target="" sidePair="center-center,middle-middle"/>
       <relation target="n57_ufim" sidePair="top-bottom"/>
     </image>

wb_new_ui/assets/NewGroup/package.xml

@@ -1126,6 +1126,10 @@
     <component id="xt5s7ij2" name="btn_filter2.xml" path="/images/jifen/"/>
     <component id="xt5s7ij3" name="btn_filter16.xml" path="/images/jifen/"/>
     <component id="xt5s7ij4" name="btn_filter64.xml" path="/images/jifen/"/>
+    <image id="kt8n7ij5" name="image 18.png" path="/images/"/>
+    <image id="kt8n7ij6" name="image 152.png" path="/"/>
+    <image id="kt8n7ij7" name="Rectangle 432.png" path="/component/Lst_room/"/>
+    <image id="kt8n7ij8" name="Rectangle 441.png" path="/images/room/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>