ss

lua_probject/base_project/Game/View/ResultView.lua

@@ -270,8 +270,6 @@ function M:InitBigResult(room, fontsize)
         local isWin = false
         for i = 1, #self._resultInfo.player_list do
             local player_info = self._resultInfo.player_list[i]
-            printlog("player_info:")
-            pt(player_info)
             local total_score = room:GetTotalScore(player_info.score)
             local hp_nonnegative = room:checkHpNonnegative()
             player_info.total_score = 0
@@ -304,7 +302,7 @@ function M:InitBigResult(room, fontsize)
 
             local item = player_list:AddItemFromPool()
             item:GetChild('txt_name').text = player_info.nick
-
+            item:GetChild('txt_userid').text = player_info.userId
             local head = item:GetChild('head'):GetChild('n4')
             ImageLoad.Load(player_info.head_url, head)
 

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

@@ -837,7 +837,6 @@ end
 
 function M:GetHandCardOffset(count)
     local start = -50 ---54
-
     local offset = 0
     if count > 10 then
         offset = start - count + 18
@@ -849,6 +848,15 @@ end
 
 function M:GetHandCardPos(index, card_count)
     local x, y = 0, -18
+
+    printlog("DataManager.CurrenRoom.cardsize:"..DataManager.CurrenRoom.cardsize)
+    if DataManager.CurrenRoom.cardsize == 0 then
+        y = -70
+    elseif DataManager.CurrenRoom.cardsize == 1 then
+        y = -50
+    elseif DataManager.CurrenRoom.cardsize == 2 then
+        y = -30
+    end
     local offset = self:GetHandCardOffset(card_count)
     local middle_x = self.cards_view.width / 2
     local start_x = middle_x - (card_count / 2 * (self.card_width + offset)) + (offset / 2)

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

@@ -43,7 +43,7 @@ end
 
 function M:GetDes(sp)
   sp = sp or "  "  
-  local str = self.round and self.round .. "局" .. sp or ""
+  local str = "百息结算局" .. sp
   str = str .. RoomConfig.GetDes(self, sp)
   if self.maxPlayers == 2 then
     if self.qupai then
@@ -52,7 +52,7 @@ function M:GetDes(sp)
     end
   end
 
-  str = str .. "娄底放炮罚 十五息起胡 明偎 天地胡 30胡翻倍 红黑胡"
+  str = str .. "娄底放炮罚 十五息起胡 明偎 天地胡 20胡100息 30胡翻倍 红黑胡"
   str = str .. sp
   return str
 end

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

@@ -904,6 +904,7 @@ function M:FillItemData2(room, data, list)
         local user = room:GetPlayerBySeat(data[i].seat).self_user
         local p = room:GetPlayerBySeat(data[i].seat)
         player_list[i].id = user.account_id
+        player_list[i].userId = user.account_id
         local total_score = data[i].total_score
         player_list[i].hp_info = data[i].hp_info
         player_list[i].score = total_score
@@ -963,14 +964,18 @@ function M:FillItemData2(room, data, list)
         player_list[i].param[5].key = '打鸟总分:'
         player_list[i].param[5].value = tostring(dncount)   
 
+        player_list[i].param[6] = {}
+        player_list[i].param[6].key = '[u][color=#0000FF]总胡息:[/color][/u]'
+        player_list[i].param[6].value = '[u][color=#0000FF]'..tostring(data[i].total_huxi)..'[/color][/u]'
+
     end
  
     local round = room.room_config.round
     self:GenerateRoomResultInfo(round, room.room_config:GetGameName(), room.room_id, room.create_time, player_list)
     
-    self:SetGSListlineGap(5)
+    self:SetGSListlineGap(1)
    -- room.room_config.isNonnegative = 0
-    self:InitBigResult(room, 26)
+    self:InitBigResult(room, 30)
     
 
     

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

@@ -70,7 +70,7 @@
       <gearDisplay controller="button" pages="1"/>
       <Button icon="ui://27vd145baen8chr"/>
     </component>
-    <list id="n30_n1ry" name="player_list" xy="58,418" size="942,268" group="n70_dunj" layout="row" selectionMode="none" colGap="221" defaultItem="ui://ppu1wv76j4mf9d" vAlign="middle" autoClearItems="true">
+    <list id="n30_n1ry" name="player_list" xy="58,419" size="942,268" group="n70_dunj" layout="row" selectionMode="none" colGap="221" defaultItem="ui://ppu1wv76j4mf9d" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
     </list>
@@ -90,7 +90,7 @@
     <text id="n31_n1ry" name="111" xy="45,66" size="115,53" group="n45_n1ry" font="Microsoft YaHei" fontSize="32" color="#ffffcc" vAlign="middle" autoSize="none" text="底牌："/>
     <list id="n32_n1ry" name="dipai_list" xy="171,66" size="1101,64" group="n45_n1ry" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://v6yvqp7wyfzf1h4" vAlign="middle"/>
     <text id="n39_n1ry" name="huxi" xy="989,319" size="257,41" group="n45_n1ry" fontSize="28" color="#924e00" vAlign="middle" autoSize="none" bold="true" singleLine="true" text=""/>
-    <list id="n46_n1ry" name="fullname_list" xy="826,148" size="166,260" group="n45_n1ry" selectionMode="none" lineGap="5" colGap="-10" defaultItem="ui://ppu1wv76j4mf9n" autoClearItems="true">
+    <list id="n46_n1ry" name="fullname_list" xy="811,143" size="166,260" group="n45_n1ry" selectionMode="none" lineGap="5" colGap="-10" defaultItem="ui://ppu1wv76j4mf9n" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -98,7 +98,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n41_n1ry" name="card_list" xy="208,131" pivot="0.5,0.5" size="605,276" group="n45_n1ry" rotation="180" layout="row" selectionMode="none" colGap="5" defaultItem="ui://ppu1wv76j4mf9k" align="center" vAlign="bottom" autoClearItems="true">
+    <list id="n41_n1ry" name="card_list" xy="208,128" pivot="0.5,0.5" size="605,276" group="n45_n1ry" rotation="180" layout="row" selectionMode="none" colGap="5" defaultItem="ui://ppu1wv76j4mf9k" align="center" vAlign="bottom" autoClearItems="true">
       <item/>
       <item/>
     </list>

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

@@ -20,7 +20,7 @@
     <text id="n30_rbpg" name="txt_userid" xy="55,144" size="125,39" group="n20_n1ry" fontSize="28" color="#b25116" vAlign="middle" autoSize="none" text="1235656"/>
     <text id="n31_rbpg" name="tili_id" xy="1,143" size="56,37" group="n20_n1ry" fontSize="26" color="#b25116" text="ID："/>
     <group id="n20_n1ry" name="n20" xy="0,0" size="267,220"/>
-    <list id="n22_ey1o" name="card_list" xy="330,0" pivot="0.5,0.5" size="315,191" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" align="right">
+    <list id="n22_ey1o" name="card_list" xy="330,7" pivot="0.5,0.5" size="315,191" rotation="180" layout="row" colGap="1" defaultItem="ui://ppu1wv76j4mf9e" align="right">
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Extend_Poker_RunFastNew/component/card_info/Player_card_info_1.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1050,200" opaque="false" initName="player_card_info">
-  <controller name="output" pages="0,,1,,2," selected="1"/>
+  <controller name="output" pages="0,,1,,2," selected="0"/>
-  <controller name="out_card_option" pages="0,,1,,2," selected="1"/>
+  <controller name="out_card_option" pages="0,,1,,2," selected="0"/>
   <controller name="put_error" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1,,2,,3," selected="0"/>
   <controller name="piao_value" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
   <displayList>
-    <component id="n47_g618" name="hand_poker_c" src="prgz89" fileName="component/poker/hand_poker_con.xml" xy="-173,-15" size="1335,190">
+    <component id="n47_g618" name="hand_poker_c" src="prgz89" fileName="component/poker/hand_poker_con.xml" xy="-173,6" size="1335,190">
       <relation target="" sidePair="bottom-bottom,width-width"/>
     </component>
     <list id="n46_sdax" name="out_card_list" xy="115,-196" size="874,120" layout="row" colGap="-50" autoItemSize="false" align="center" vAlign="middle">

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

@@ -2,7 +2,7 @@
 <component size="1334,750" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
   <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
-  <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
+  <controller name="action" pages="2,空,0,准备,1,开始" selected="1"/>
   <controller name="jushu" pages="0,,1," selected="0"/>
   <controller name="bg_state" pages="0,,1,,2," selected="0"/>
   <displayList>
@@ -35,24 +35,24 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n34_k3io" name="btn_ready1" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="381,416" group="n36_k3io" visible="false">
+    <component id="n34_k3io" name="btn_ready1" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="382,416" group="n36_k3io" visible="false">
       <gearDisplay controller="action" pages="0"/>
       <Button icon="ui://27vd145bk3io3u"/>
     </component>
-    <component id="n35_k3io" name="btn_start1" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="381,416" group="n36_k3io" visible="false">
+    <component id="n35_k3io" name="btn_start1" src="ycze3m" fileName="buttons/Btn_Yellow.xml" pkg="27vd145b" xy="382,416" group="n36_k3io" visible="false">
       <Button icon="ui://27vd145bk3io3t"/>
     </component>
-    <component id="n169_o49p" name="btn_ready" src="kzpehy5" fileName="component/game/btn_ready.xml" pkg="27vd145b" xy="416,398" group="n36_k3io">
+    <component id="n169_o49p" name="btn_ready" src="kzpehy5" fileName="component/game/btn_ready.xml" pkg="27vd145b" xy="257,393" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
       <Button icon="ui://27vd145bf7zuchl"/>
     </component>
-    <component id="n170_o49p" name="btn_start" src="rbz8chn" fileName="buttons/Btn_newYellow_long.xml" pkg="27vd145b" xy="364,396" group="n36_k3io" visible="false">
+    <component id="n170_o49p" name="btn_start" src="rbz8chn" fileName="buttons/Btn_newYellow_long.xml" pkg="27vd145b" xy="365,396" group="n36_k3io" visible="false">
       <Button icon="ui://27vd145bf7zuchk"/>
     </component>
-    <component id="n184_a81d" name="btn_xipai" src="a81d1hg" fileName="component/Main/component/btn_xipai.xml" xy="765,398" group="n36_k3io">
+    <component id="n184_a81d" name="btn_xipai" src="a81d1hg" fileName="component/Main/component/btn_xipai.xml" xy="836,393" group="n36_k3io">
       <gearDisplay controller="action" pages="0,1"/>
     </component>
-    <group id="n36_k3io" name="n36" xy="364,396" size="641,124" advanced="true">
+    <group id="n36_k3io" name="n36" xy="257,393" size="819,127" advanced="true">
       <gearDisplay controller="state" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>

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="323,-170" group="n48_cphv">
+    <component id="n46_cphv" name="daniao" src="99we1h1" fileName="component/niao/btn_niao.xml" xy="180,-232" group="n48_cphv">
       <gearDisplay controller="niao" pages="1"/>
     </component>
-    <component id="n47_cphv" name="budaniao" src="99we1h2" fileName="component/niao/btn_noniao.xml" xy="761,-170" group="n48_cphv">
+    <component id="n47_cphv" name="budaniao" src="99we1h2" fileName="component/niao/btn_noniao.xml" xy="904,-234" group="n48_cphv">
       <gearDisplay controller="niao" pages="1"/>
     </component>
-    <group id="n48_cphv" name="niao" xy="323,-170" size="688,90" advanced="true">
+    <group id="n48_cphv" name="niao" xy="180,-234" size="974,92" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

wb_new_ui/assets/Main_RunBeard/component/clearing/big_zipai_result_item.xml

@@ -16,7 +16,7 @@
       <gearDisplay controller="self" pages="0"/>
     </image>
     <text id="n3_tjnv" name="txt_name" xy="98,9" size="175,34" fontSize="26" color="#651d07" vAlign="middle" autoSize="none" text="打发斯蒂芬呃呃"/>
-    <text id="n4_tjnv" name="txt_reserve_hp" xy="100,65" size="176,34" fontSize="26" color="#651d07" vAlign="middle" autoSize="none" text=""/>
+    <text id="n4_tjnv" name="txt_reserve_hp" xy="100,65" size="176,34" visible="false" fontSize="26" color="#651d07" vAlign="middle" autoSize="none" text=""/>
     <image id="n7_tjnv" name="n7" src="aen81bl" fileName="component/clearing/image/fgx.png" xy="30,105" visible="false">
       <gearXY controller="have_flag" pages="0,1" values="30,105|42,147"/>
     </image>

wb_new_ui/assets/Main_RunBeard/component/clearing/descript_item_zipai.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="220,45">
+<component size="260,50">
   <displayList>
-    <text id="n1_tjnv" name="txt_value" xy="217,23" pivot="1,0.5" anchor="true" size="79,48" fontSize="30" color="#a02808" align="center" vAlign="middle" leading="1" autoSize="none" text="100"/>
+    <text id="n1_tjnv" name="txt_value" xy="262,26" pivot="1,0.5" anchor="true" size="79,48" font="Microsoft YaHei" fontSize="30" color="#a02808" align="center" vAlign="middle" leading="1" ubb="true" autoSize="none" text="100"/>
-    <text id="n0_tjnv" name="txt_key" xy="-3,22" pivot="0,0.5" anchor="true" size="141,46" fontSize="30" color="#a02808" vAlign="middle" leading="1" autoSize="none" text="胡牌次数"/>
+    <text id="n0_tjnv" name="txt_key" xy="1,25" pivot="0,0.5" anchor="true" size="174,46" font="Microsoft YaHei" fontSize="30" color="#a02808" vAlign="middle" leading="1" ubb="true" autoSize="none" text="胡牌次数"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_RunBeard/component/clearing/result_zipai_main.xml

@@ -23,47 +23,47 @@
     <group id="n4_tjnv" name="title" xy="303,-2" size="738,133" group="n31_aen8" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n6_tjnv" name="btn_result_share1" src="tjnvcg6" fileName="component/result/component/btn_result_share.xml" pkg="27vd145b" xy="84,594" size="233,91" group="n7_tjnv" visible="false">
+    <component id="n6_tjnv" name="btn_result_share1" src="tjnvcg6" fileName="component/result/component/btn_result_share.xml" pkg="27vd145b" xy="84,629" size="233,91" group="n7_tjnv" visible="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n5_tjnv" name="btn_result_confirm1" src="tjnvcg5" fileName="component/result/component/btn_result_confirm.xml" pkg="27vd145b" xy="1004,595" size="239,97" group="n7_tjnv" visible="false">
+    <component id="n5_tjnv" name="btn_result_confirm1" src="tjnvcg5" fileName="component/result/component/btn_result_confirm.xml" pkg="27vd145b" xy="1004,630" size="239,97" group="n7_tjnv" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n41_aen8" name="btn_result_share" src="aen81bs" fileName="component/clearing/zipai_btn_result_share.xml" xy="86,582" group="n7_tjnv" touchable="false">
+    <component id="n41_aen8" name="btn_result_share" src="aen81bs" fileName="component/clearing/zipai_btn_result_share.xml" xy="86,617" group="n7_tjnv" touchable="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n45_mj9f" name="btn_result_confirm" src="mj9f1g0" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="1010,582" group="n7_tjnv">
+    <component id="n45_mj9f" name="btn_result_confirm" src="mj9f1g0" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="1010,617" group="n7_tjnv">
       <relation target="" sidePair="right-right"/>
     </component>
-    <component id="n42_aen8" name="btn_continue_game" src="aen81bq" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1010,593" size="244,103" group="n7_tjnv" visible="false">
+    <component id="n42_aen8" name="btn_continue_game" src="aen81bq" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1010,628" size="244,103" group="n7_tjnv" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <group id="n7_tjnv" name="bottom" xy="84,582" size="1170,124" group="n31_aen8"/>
+    <group id="n7_tjnv" name="bottom" xy="84,617" size="1170,124" group="n31_aen8"/>
     <component id="n46_mj9f" name="btn_close" src="mj9f1g1" fileName="component/clearing/btn_result_close.xml" xy="1239,0" group="n31_aen8">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <image id="n36_aen8" name="n36" src="aen81b9" fileName="component/clearing/image/zipai_shuoming_di.png" xy="416,602" group="n11_tjnv"/>
+    <image id="n36_aen8" name="n36" src="aen81b9" fileName="component/clearing/image/zipai_shuoming_di.png" xy="416,621" group="n11_tjnv"/>
-    <image id="n9_tjnv" name="n9" src="aen81ba" fileName="component/clearing/image/hd.png" xy="294,599" size="749,92" group="n11_tjnv" visible="false"/>
+    <image id="n9_tjnv" name="n9" src="aen81ba" fileName="component/clearing/image/hd.png" xy="294,623" size="749,92" group="n11_tjnv" visible="false"/>
-    <text id="n10_tjnv" name="txt_play" xy="434,610" size="488,73" group="n11_tjnv" fontSize="24" color="#ffdabb" align="center" vAlign="middle" autoSize="shrink" text="玩法说明玩法 玩法说明玩法 玩法说明玩法法说明玩法 玩法说明玩法 法说明玩法 玩法说明玩法 明玩法"/>
+    <text id="n10_tjnv" name="txt_play" xy="434,631" size="488,73" group="n11_tjnv" font="Microsoft YaHei" fontSize="24" color="#ffdabb" align="center" vAlign="middle" autoSize="shrink" text="玩法说明玩法 玩法说明玩法 玩法说明玩法法说明玩法 玩法说明玩法 法说明玩法 玩法说明玩法 明玩法"/>
-    <group id="n11_tjnv" name="player" xy="294,599" size="749,92" group="n31_aen8" advanced="true">
+    <group id="n11_tjnv" name="player" xy="294,621" size="749,94" group="n31_aen8" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </group>
-    <list id="n26_tjnv" name="player_list" xy="0,172" size="1321,416" group="n31_aen8" touchable="false" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v6yvqp7waen81bf" align="center" vAlign="middle">
+    <text id="n28_tjnv" name="n28" xy="467,688" size="409,74" group="n31_aen8" fontSize="18" color="#ffffff" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <text id="n27_tjnv" name="txt_game_name" xy="542,112" size="134,37" group="n34_aen8" fontSize="26" color="#a02808" align="center" vAlign="middle" text="娄底放炮罚"/>
+    <text id="n29_tjnv" name="txt_game_data" xy="836,109" size="212,37" group="n34_aen8" fontSize="26" color="#a02808" align="center" vAlign="middle" text="2019-12-12 18:28"/>
+    <text id="n15_tjnv" name="txt_room_id" xy="205,113" size="177,37" group="n34_aen8" fontSize="26" color="#a02808" align="center" vAlign="middle" text="房间号:888888"/>
+    <group id="n34_aen8" name="n34" xy="205,109" size="923,41" group="n31_aen8" advanced="true">
+      <relation target="" sidePair="center-center"/>
+    </group>
+    <list id="n26_tjnv" name="player_list" xy="0,150" size="1321,464" group="n31_aen8" touchable="false" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v6yvqp7waen81bf" align="center" vAlign="middle">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <text id="n28_tjnv" name="n28" xy="467,688" size="409,74" group="n31_aen8" fontSize="18" color="#ffffff" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
-      <relation target="" sidePair="center-center"/>
-    </text>
-    <text id="n27_tjnv" name="txt_game_name" xy="542,129" size="134,37" group="n34_aen8" fontSize="26" color="#a02808" align="center" vAlign="middle" text="娄底放炮罚"/>
-    <text id="n29_tjnv" name="txt_game_data" xy="836,126" size="212,37" group="n34_aen8" fontSize="26" color="#a02808" align="center" vAlign="middle" text="2019-12-12 18:28"/>
-    <text id="n15_tjnv" name="txt_room_id" xy="205,130" size="177,37" group="n34_aen8" fontSize="26" color="#a02808" align="center" vAlign="middle" text="房间号:888888"/>
-    <group id="n34_aen8" name="n34" xy="205,126" size="923,41" group="n31_aen8" advanced="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
     <group id="n31_aen8" name="n31" xy="0,-2" size="1321,764" advanced="true"/>
     <image id="n12_tjnv" name="n12" src="aen81bb" fileName="component/clearing/image/jfd.png" xy="47,97" size="139,59" group="n14_tjnv"/>
     <text id="n13_tjnv" name="txt_time" xy="52,109" size="134,37" group="n14_tjnv" fontSize="28" color="#ffffff" vAlign="middle" autoSize="shrink" text="倍数：5"/>

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

@@ -19,7 +19,7 @@
       <Button icon="ui://v6yvqp7wmk2u12t"/>
     </component>
     <component id="n33_mk2u" name="btn_close22" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="596,0" size="101,100" group="n58_mk2u" visible="false" controller="style,0"/>
-    <list id="n34_mk2u" name="lst_bg" xy="113,319" size="582,105" group="n58_mk2u" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="35" colGap="50" lineItemCount="3" defaultItem="ui://v6yvqp7wmk2u130" align="center" vAlign="middle">
+    <list id="n34_mk2u" name="lst_bg" xy="113,319" size="582,105" group="n58_mk2u" layout="flow_hz" overflow="scroll" scroll="horizontal" lineGap="35" colGap="50" lineItemCount="3" defaultItem="ui://v6yvqp7wmk2u130" align="center" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="center-center"/>
       <item/>
       <item/>

wb_unity_pro_2/Library/CurrentLayout-default.dwlt

@@ -14,8 +14,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 822.6667
+    x: 580.6667
-    y: 50
+    y: 80.66667
     width: 876.6667
     height: 854.6667
   m_ShowMode: 4
@@ -114,7 +114,7 @@ MonoBehaviour:
   m_MinSize: {x: 201, y: 342}
   m_MaxSize: {x: 4001, y: 8042}
   vertical: 0
-  controlID: 15
+  controlID: 34
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -139,7 +139,7 @@ MonoBehaviour:
   m_MinSize: {x: 201, y: 342}
   m_MaxSize: {x: 4001, y: 8042}
   vertical: 1
-  controlID: 16
+  controlID: 35
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -158,7 +158,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 877
-    height: 407
+    height: 403
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 10}
@@ -183,9 +183,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 407
+    y: 403
     width: 877
-    height: 398
+    height: 402
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 12}
@@ -331,10 +331,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 822.6667
+    x: 0
-    y: 80
+    y: 19
     width: 876
-    height: 386
+    height: 382
   m_ViewDataDictionary: {fileID: 0}
   m_SerializedViewNames: []
   m_SerializedViewValues: []
@@ -369,7 +369,7 @@ MonoBehaviour:
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
@@ -381,22 +381,22 @@ MonoBehaviour:
       x: 0
       y: 21
       width: 876
-      height: 365
+      height: 361
-    m_Scale: {x: 0.38020834, y: 0.38020834}
+    m_Scale: {x: 0.37604168, y: 0.37604168}
-    m_Translation: {x: 438, y: 182.5}
+    m_Translation: {x: 438, y: 180.49998}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -1152
+      x: -1164.7645
-      y: -480
+      y: -479.99994
-      width: 2304
+      width: 2329.529
-      height: 960
+      height: 959.99994
     m_MinimalGUI: 1
-  m_defaultScale: 0.38020834
+  m_defaultScale: 0.37604168
-  m_LastWindowPixelSize: {x: 1314, y: 579}
+  m_LastWindowPixelSize: {x: 1314, y: 573}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 00000001000000000000
@@ -453,7 +453,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: f03b0000
     m_LastClickedID: 15344
-    m_ExpandedIDs: 000000002e3c0000
+    m_ExpandedIDs: 00000000f03b0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -481,7 +481,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000002e3c0000
+    m_ExpandedIDs: 00000000f03b0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -558,10 +558,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 822.6667
+    x: 0
-    y: 487.33334
+    y: 422
     width: 876
-    height: 377
+    height: 381
   m_ViewDataDictionary: {fileID: 0}
 --- !u!114 &13
 MonoBehaviour:
@@ -594,7 +594,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: bcfaffff
+      m_ExpandedIDs: 60fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 

wb_unity_pro_2/Library/StateCache/Hierarchy/bfa95a-mainStage.json

@@ -1 +1 @@
-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1184],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1186],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}

wb_unity_pro_2/Library/shadercompiler-UnityShaderCompiler.exe0.log

@@ -1,2 +0,0 @@
-Base path: 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.4.10f1/Editor/Data/PlaybackEngines'
-Cmd: initializeCompiler