替换部分ui，完善结算界面位置

fk101/lua_probject/base_project/Game/View/Common/BaseWindow.lua

@@ -106,10 +106,11 @@ function M:init(url)
 			click_item.height = self._view.height
 	  	end
 	else
+		self._root_view.height = GRoot.inst.height
+		self._root_view.width = GRoot.inst.width
 		contentPane:AddChild(self._view)
-		contentPane.height = self._view.height
-		contentPane.width = self._view.width
-		contentPane:Center()
+		self._view:Center()
+
 	end
 	self._contentPane = contentPane
 	if self._put_map then

fk101/lua_probject/extend_project/extend/majiang/100zhang/EXClearingView.lua

@@ -8,7 +8,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/changsha/EXClearingView.lua

@@ -8,7 +8,7 @@ local M = CS_ClearingView
 function CS_ClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/chaoshan/EXClearingView.lua

@@ -8,7 +8,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/chaozhou/EXClearingView.lua

@@ -7,7 +7,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/chaozhougui/EXClearingView.lua

@@ -8,7 +8,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/gejiu/EXClearingView.lua

@@ -8,7 +8,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua

@@ -7,7 +7,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, { __index = ResultView })
 	local self = setmetatable({}, { __index = M })
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/qizhiba/EXClearingView.lua

@@ -8,7 +8,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_PokeMaJiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/tuidaohu/EXClearingView.lua

@@ -8,7 +8,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

fk101/lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua

@@ -7,7 +7,7 @@ local M = EXClearingView
 function EXClearingView.new(blur_view)
 	setmetatable(M, {__index = ResultView})
 	local self = setmetatable({}, {__index = M})
-	self._full = true
+	-- self._full = true
 	ResultView.init(self, "ui://Main_Majiang/clearing")
 
 	self._currenIndex = 0

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

@@ -7,7 +7,7 @@ local M = RunBeard_ResultView
 function RunBeard_ResultView.new(blur_view, index)
     setmetatable(M, {__index = ResultView})
     local self = setmetatable({}, {__index = M})
-    self._full=true
+    -- self._full=true
     self.class = 'RunBeard_ResultView'
     self._currenIndex = 0
     if index ~= 1 then

fk101/lua_probject/extend_project/extend/zipai/fulushou/RunBeard_ResultView.lua

@@ -7,7 +7,7 @@ local M = RunBeard_ResultView
 function RunBeard_ResultView.new(blur_view, index)
     setmetatable(M, {__index = ResultView})
     local self = setmetatable({}, {__index = M})
-    self._full=true
+    -- self._full=true
     self.class = 'RunBeard_ResultView'
     self._currenIndex = 0
     if index ~= 1 then

fk101/lua_probject/extend_project/extend/zipai/hsrunbeard/RunBeard_ResultView.lua

@@ -7,7 +7,7 @@ local M = RunBeard_ResultView
 function RunBeard_ResultView.new(blur_view, index)
     setmetatable(M, {__index = ResultView})
     local self = setmetatable({}, {__index = M})
-    self._full=true
+    -- self._full=true
     self.class = 'RunBeard_ResultView'
     self._currenIndex = 0
     if index ~= 1 then

fk101/lua_probject/extend_project/extend/zipai/runbeard/RunBeard_ResultView.lua

@@ -7,7 +7,7 @@ local M = RunBeard_ResultView
 function RunBeard_ResultView.new(blur_view, index)
     setmetatable(M, {__index = ResultView})
     local self = setmetatable({}, {__index = M})
-    self._full=true
+    -- self._full=true
     self.class = 'RunBeard_ResultView'
     self._currenIndex = 0
     if index ~= 1 then

fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi/RunBeard_ResultView.lua

@@ -7,7 +7,7 @@ local M = RunBeard_ResultView
 function RunBeard_ResultView.new(blur_view, index)
     setmetatable(M, {__index = ResultView})
     local self = setmetatable({}, {__index = M})
-    self._full=true
+    -- self._full=true
     self.class = 'RunBeard_ResultView'
     self._currenIndex = 0
     if index ~= 1 then

fk101/lua_probject/extend_project/extend/zipai/yueyangwaihuzi_bak/RunBeard_ResultView.lua

@@ -7,7 +7,7 @@ local M = RunBeard_ResultView
 function RunBeard_ResultView.new(blur_view, index)
     setmetatable(M, {__index = ResultView})
     local self = setmetatable({}, {__index = M})
-    self._full=true
+    -- self._full=true
     self.class = 'RunBeard_ResultView'
     self._currenIndex = 0
     if index ~= 1 then

fk101/wb_new_ui/.objs/metas/3z9lj55v/jokmft.info

@@ -1,22 +1,13 @@
 {
   "objectStatus": {
-    "n79_uwvl": {
-      "collapsed": true
+    "n40_ona1": {
+      "hidden": true
     },
     "n36_piv9": {
       "hidden": true
     },
     "n22_xtwh": {
       "hidden": true
-    },
-    "n40_ona1": {
-      "hidden": true
-    },
-    "n29_10imx": {
-      "collapsed": true
-    },
-    "n52_ona1": {
-      "collapsed": true
     }
   }
 }

fk101/wb_new_ui/.objs/workspace.json

@@ -1,29 +1,58 @@
 {
   "libview.firstColumnWidth": 356,
+  "test.device": "Xiaomi 9",
   "libview.iconScale": 0,
   "doc.openedDocs": [
     "ui://27vd145bhxjc7i4q",
     "ui://kplym8mus9wxa",
     "ui://fnuxqeflnrnod",
+    "ui://egnzysm7ffp36a",
+    "ui://27vd145bimywcd5",
+    "ui://egnzysm7ffp370",
+    "ui://v2hilfzbgq7mde",
+    "ui://ypulwxjhl9mn14",
+    "ui://yzaioi79aen81b0",
+    "ui://k15boclkl9mn14",
+    "ui://oubpz2r2ofil7k",
+    "ui://442j0uepygxga",
+    "ui://3n2top74kpmgkd",
+    "ui://9n9stu2eprgzee",
+    "ui://awernf6xbazq7n",
+    "ui://qpsoxvaiprgzee",
+    "ui://b8jloj2qg8ktcmb",
+    "ui://3op8sm5eu86s1f",
+    "ui://niy3ldiwl9mn14",
+    "ui://5cdldr01qaqf2c",
     "ui://c7j2rnvqtpf02f",
     "ui://y8prev1ms9wx7",
+    "ui://b50sd5s6s9wx7",
+    "ui://xul2z8cts9wx7",
+    "ui://visk5g30gq7m2c",
+    "ui://s63l0suw6cpqv",
+    "ui://425x67nrs9wx7",
+    "ui://kplym8mus9wx7",
     "ui://3z9lj55vjokmft",
+    "ui://27vd145blwcl28",
+    "ui://m7iejg46mpllhuq",
+    "ui://3z9lj55vjokmet",
+    "ui://3z9lj55vjokm8z",
+    "ui://3z9lj55vjokmdt",
+    "ui://3z9lj55vjokmey",
     "ui://4skil1l6piv91ny",
     "ui://niy3ldiwl9mny",
     "ui://niy3ldiwl9mn19",
     "ui://9n9stu2eprgzei",
-    "ui://9n9stu2eprgzef"
+    "ui://9n9stu2eprgzef",
+    "ui://27vd145bpgy941"
   ],
   "auxline1": true,
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://9n9stu2eprgzef",
+  "doc.activeDoc": "ui://27vd145blwcl28",
   "libview.twoColumn": false,
-  "libview.expandedNodes": [
-    "27vd145b",
-    "/"
-  ],
+  "libview.expandedNodes": [],
   "snapToGrid": true,
+  "test.orientation": "landscape",
   "backgroundColor": 6710886,
   "libview.currentGroup": "",
   "gridSize": 30,

fk101/wb_new_ui/assets/Common/component/dismiss_room/dismiss_room.xml

@@ -5,9 +5,9 @@
     <image id="n17_j5s5" name="bg" src="m0eibt" fileName="font/images/win/tkd.png" xy="0,0" size="1159,534">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n11_bt6w" name="n11" xy="474,73" size="124,42" group="n16_fscl" font="Microsoft YaHei" fontSize="30" color="#2365bb" align="center" vAlign="middle" bold="true" text="倒计时："/>
-    <text id="n12_bt6w" name="tex_time" xy="602,74" size="76,42" group="n16_fscl" font="Microsoft YaHei" fontSize="30" color="#2365bb" bold="true" text="180s"/>
-    <group id="n16_fscl" name="n16" xy="474,73" size="204,43"/>
+    <text id="n11_bt6w" name="n11" xy="474,86" size="124,42" group="n16_fscl" font="Microsoft YaHei" fontSize="30" color="#2365bb" align="center" vAlign="middle" bold="true" text="倒计时："/>
+    <text id="n12_bt6w" name="tex_time" xy="602,87" size="76,42" group="n16_fscl" font="Microsoft YaHei" fontSize="30" color="#2365bb" bold="true" text="180s"/>
+    <group id="n16_fscl" name="n16" xy="474,86" size="204,43"/>
     <text id="n0_pgy9" name="tex_tip" xy="100,134" size="1010,65" font="Microsoft YaHei" fontSize="30" color="#663300" align="center" vAlign="middle" ubb="true" autoSize="none" bold="true" text="[color=#902F5D]【淡淡对对对的道的】[/color]发起了解散房间申请，是否同意？"/>
     <text id="n10_bt6w" name="n10" xy="352,202" size="454,42" font="Microsoft YaHei" fontSize="30" color="#663300" align="center" vAlign="middle" bold="true" text="（倒计时之内不操作则视为同意）"/>
     <list id="n13_bt6w" name="lst_player" xy="105,253" size="1003,143" touchable="false" layout="flow_hz" overflow="scroll" lineGap="11" colGap="17" lineItemCount="4" defaultItem="ui://27vd145bbt6w96" align="center" vAlign="middle" autoClearItems="true">
@@ -24,11 +24,11 @@
     </list>
     <component id="n7_bt6w" name="btn_aggree" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="301,420" size="176,74" group="n14_bt6w">
       <relation target="" sidePair="left-left"/>
-      <Button title=" " icon="ui://27vd145bbt6w93"/>
+      <Button title=" " icon="ui://27vd145biss87il8"/>
     </component>
     <component id="n8_bt6w" name="btn_reject" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="681,420" size="176,74" group="n14_bt6w">
       <relation target="" sidePair="left-right"/>
-      <Button title=" " icon="ui://27vd145bbt6w94"/>
+      <Button title=" " icon="ui://27vd145biss87il7"/>
     </component>
     <group id="n14_bt6w" name="n14" xy="301,420" size="556,74" advanced="true">
       <gearDisplay controller="falg" pages="0"/>

fk101/wb_new_ui/assets/Common/package.xml

@@ -1144,6 +1144,8 @@
     <image id="loe77il4" name="Group 518.png" path="/conMui/" exported="true"/>
     <component id="loe77il5" name="Btn_closeMm.xml" path="/buttons/" exported="true"/>
     <component id="loe77il6" name="Btn_closeMm1.xml" path="/buttons/" exported="true"/>
+    <image id="iss87il7" name="Group 522111.png" path="/conMui/"/>
+    <image id="iss87il8" name="Group 521111.png" path="/conMui/"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

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

@@ -26,22 +26,22 @@
     <group id="n4_tjnv" name="title" xy="555,-21" size="1247,199" group="n31_aen8" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n6_tjnv" name="btn_result_share1" src="ffp376" fileName="component/result/component/btn_result_share.xml" xy="597,997" size="341,115" group="n7_tjnv" visible="false">
+    <component id="n6_tjnv" name="btn_result_share1" src="ffp376" fileName="component/result/component/btn_result_share.xml" xy="597,965" size="341,115" group="n7_tjnv" visible="false">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n5_tjnv" name="btn_result_confirm1" src="ffp378" fileName="component/result/component/btn_result_confirm.xml" xy="1055,1000" size="239,83" group="n7_tjnv" visible="false">
+    <component id="n5_tjnv" name="btn_result_confirm1" src="ffp378" fileName="component/result/component/btn_result_confirm.xml" xy="1055,968" size="239,83" group="n7_tjnv" visible="false">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <component id="n41_aen8" name="btn_result_share" src="ffp37a" fileName="component/clearing/zipai_btn_result_share.xml" xy="558,979" size="357,158" group="n7_tjnv">
+    <component id="n41_aen8" name="btn_result_share" src="ffp37a" fileName="component/clearing/zipai_btn_result_share.xml" xy="558,947" size="357,158" group="n7_tjnv">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n45_mj9f" name="btn_result_confirm" src="ffp37c" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="995,979" size="357,158" group="n7_tjnv">
+    <component id="n45_mj9f" name="btn_result_confirm" src="ffp37c" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="995,947" size="357,158" group="n7_tjnv">
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n42_aen8" name="btn_continue_game" src="ffp37e" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1430,979" size="357,158" group="n7_tjnv">
+    <component id="n42_aen8" name="btn_continue_game" src="ffp37e" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1430,947" size="357,158" group="n7_tjnv">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <group id="n7_tjnv" name="bottom" xy="558,979" size="1229,158" group="n31_aen8"/>
+    <group id="n7_tjnv" name="bottom" xy="558,947" size="1229,158" group="n31_aen8" advanced="true"/>
     <component id="n46_mj9f" name="btn_close" src="ffp37g" fileName="component/clearing/btn_result_close.xml" xy="41,31" group="n31_aen8">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
@@ -65,7 +65,7 @@
     <group id="n34_aen8" name="n34" xy="917,129" size="517,37" group="n31_aen8" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <group id="n31_aen8" name="n31" xy="0,-21" size="2348,1158" advanced="true"/>
+    <group id="n31_aen8" name="n31" xy="0,-21" size="2348,1147" advanced="true"/>
     <image id="n12_tjnv" name="n12" src="iu2zds" fileName="component/EPCDWHZMui/Frame 787.png" xy="0,220" size="194,84" group="n14_tjnv"/>
     <text id="n13_tjnv" name="txt_time" xy="0,220" size="194,84" group="n14_tjnv" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="倍数：5"/>
     <group id="n14_tjnv" name="group_times" xy="0,220" size="194,84" advanced="true">

fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2348,1126">
   <controller name="over" pages="0,,1," selected="1"/>
-  <controller name="button" pages="0,,1," selected="0"/>
-  <controller name="sdk" pages="0,,1," selected="1"/>
-  <controller name="type" pages="0,,1,,2,,3,,4," selected="4"/>
-  <controller name="mapai" pages="0,,1," selected="1"/>
-  <controller name="matype" pages="0,,1," selected="1"/>
+  <controller name="button" pages="0,,1," selected="1"/>
+  <controller name="sdk" pages="0,,1," selected="0"/>
+  <controller name="type" pages="0,,1,,2,,3,,4," selected="0"/>
+  <controller name="mapai" pages="0,,1," selected="0"/>
+  <controller name="matype" pages="0,,1," selected="0"/>
   <controller name="matypeshow" pages="0,,1," selected="0"/>
   <controller name="matypebgshow" pages="0,,1," selected="0"/>
   <controller name="paixing" pages="0,,1," selected="0"/>
@@ -13,71 +13,72 @@
   <displayList>
     <component id="n110_itp8" name="bgWindow" src="jokmfu" fileName="component/Win_BaseWindow.xml" xy="0,0" size="2348,1126">
       <gearText controller="type" pages="0,1,2,3" values="解散房间|胜利|失败|流局" default=""/>
+      <Button title="解散房间"/>
     </component>
-    <list id="n3_fux2" name="player_list_1" xy="67,211" size="2221,538" group="n29_10imx" lineGap="27" defaultItem="ui://3z9lj55vjokmdt" autoItemSize="false" align="center" vAlign="middle">
+    <list id="n3_fux2" name="player_list_1" xy="67,211" size="2221,523" group="n29_10imx" lineGap="27" defaultItem="ui://3z9lj55vjokmdt" autoItemSize="false" align="center" vAlign="middle">
       <gearDisplay controller="over" pages="0"/>
       <item/>
       <item/>
     </list>
-    <text id="n34_piv9" name="tex_gameinfo" xy="0,9" size="1019,159" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" vAlign="middle" autoSize="shrink" bold="true" text="大夫看见撒地方就阿斯蒂芬啊收到了附件啊收到了附件阿斯蒂芬就撒地方空间撒地方空间撒地方就士大夫看见撒地方就阿斯蒂芬"/>
-    <text id="n35_piv9" name="tex_roominfo" xy="1415,0" size="933,174" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="房号123456 局10/16 2019-10-7 09:24:10&#xA;"/>
-    <group id="n36_piv9" name="room_info" xy="0,0" size="2348,174" group="n29_10imx" visible="false" advanced="true">
+    <text id="n34_piv9" name="tex_gameinfo" xy="0,9" size="1019,144" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" vAlign="middle" autoSize="shrink" bold="true" text="大夫看见撒地方就阿斯蒂芬啊收到了附件啊收到了附件阿斯蒂芬就撒地方空间撒地方空间撒地方就士大夫看见撒地方就阿斯蒂芬"/>
+    <text id="n35_piv9" name="tex_roominfo" xy="1415,0" size="933,159" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" singleLine="true" text="房号123456 局10/16 2019-10-7 09:24:10&#xA;"/>
+    <group id="n36_piv9" name="room_info" xy="0,0" size="2348,159" group="n29_10imx" visible="false" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <text id="n22_xtwh" name="n22" xy="140,923" size="400,26" group="n29_10imx" visible="false" fontSize="18" color="#624720" autoSize="shrink" bold="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
-    <component id="n12_nrno" name="btn_showResult" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="974,979" size="400,160" group="n29_10imx">
+    <text id="n22_xtwh" name="n22" xy="140,923" size="400,11" group="n29_10imx" visible="false" fontSize="18" color="#624720" autoSize="shrink" bold="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
+    <component id="n12_nrno" name="btn_showResult" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="974,977" size="400,145" group="n29_10imx">
       <gearDisplay controller="button" pages="1"/>
       <Button icon="ui://3z9lj55vld1zxc"/>
     </component>
-    <component id="n62_ona1" name="btn_detal" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="140,418" size="531,126" group="n28_xhvg">
+    <component id="n62_ona1" name="btn_detal" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="140,418" size="531,111" group="n28_xhvg">
       <gearDisplay controller="button" pages="0"/>
       <gearXY controller="paixing" pages="0,1" values="140,418|133,965"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://3z9lj55vjokmed"/>
     </component>
-    <component id="n104_ux6x" name="btn_fanhuipaixing" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="1689,418" size="531,126" group="n28_xhvg">
+    <component id="n104_ux6x" name="btn_fanhuipaixing" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="1689,418" size="531,111" group="n28_xhvg">
       <gearDisplay controller="button" pages="0"/>
       <gearXY controller="paixing" pages="0,1" values="1689,418|1683,965"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://3z9lj55vjokmek"/>
     </component>
-    <component id="n4_fux2" name="btn_confirm" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="769,421" size="400,160" group="n111_tki6">
+    <component id="n4_fux2" name="btn_confirm" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="769,421" size="400,145" group="n111_tki6">
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://3z9lj55vjokm90"/>
     </component>
-    <component id="n109_nlef" name="btn_xipai" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="1187,421" size="400,160" group="n111_tki6">
+    <component id="n109_nlef" name="btn_xipai" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="1187,421" size="400,145" group="n111_tki6">
       <gearDisplay controller="xipai" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://3z9lj55vjokm91"/>
     </component>
-    <group id="n111_tki6" name="n111" xy="769,421" size="818,160" group="n28_xhvg" advanced="true">
+    <group id="n111_tki6" name="n111" xy="769,421" size="818,145" group="n28_xhvg" advanced="true">
       <gearDisplay controller="button" pages="0"/>
     </group>
-    <group id="n28_xhvg" name="n28" xy="140,418" size="2080,163" group="n24_gfyh" advanced="true">
+    <group id="n28_xhvg" name="n28" xy="140,418" size="2080,148" group="n24_gfyh" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
-    <component id="n63_uwvl" name="btn_maima" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="1482,414" size="559,126" group="n65_uwvl">
+    <component id="n63_uwvl" name="btn_maima" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="1482,414" size="559,111" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://3z9lj55vjokmef"/>
     </component>
-    <component id="n64_uwvl" name="btn_jiangma" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="301,416" size="559,126" group="n65_uwvl">
+    <component id="n64_uwvl" name="btn_jiangma" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="301,416" size="559,111" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://3z9lj55vjokmee"/>
     </component>
-    <component id="n103_e0b9" name="btn_fama" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="893,414" size="559,126" group="n65_uwvl">
+    <component id="n103_e0b9" name="btn_fama" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="893,414" size="559,111" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://3z9lj55vjokmej"/>
     </component>
-    <group id="n65_uwvl" name="n65" xy="301,414" size="1740,128" group="n24_gfyh" advanced="true">
+    <group id="n65_uwvl" name="n65" xy="301,414" size="1740,113" group="n24_gfyh" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
-    <group id="n24_gfyh" name="btns" xy="140,414" size="2080,167" group="n29_10imx" advanced="true">
+    <group id="n24_gfyh" name="btns" xy="140,414" size="2080,152" group="n29_10imx" advanced="true">
       <gearXY controller="over" pages="0,1" values="133,961|140,414"/>
     </group>
-    <group id="n29_10imx" name="n29" xy="0,0" size="2348,1139" advanced="true">
+    <group id="n29_10imx" name="n29" xy="0,0" size="2348,1122" advanced="true">
       <gearDisplay controller="over" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>

fk101/wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/result_main.xml

@@ -5,21 +5,19 @@
   <controller name="share" pages="0,,1," selected="0"/>
   <controller name="group" pages="0,,1," selected="1"/>
   <displayList>
-    <component id="n6_tjnv" name="btn_result_share" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="605,979" size="345,131" group="n7_tjnv">
-      <relation target="" sidePair="left-left"/>
+    <component id="n6_tjnv" name="btn_result_share" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="658,947" size="345,131" group="n7_tjnv">
       <Button icon="ui://3z9lj55vsr1dxm"/>
     </component>
-    <component id="n5_tjnv" name="btn_result_confirm" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="1043,979" size="354,131" group="n7_tjnv">
-      <relation target="" sidePair="center-center%"/>
+    <component id="n5_tjnv" name="btn_result_confirm" src="jokmev" fileName="component/clearing/room/btn_invite(1).xml" xy="1037,947" size="345,131" group="n7_tjnv">
       <Button icon="ui://3z9lj55vsr1dxn"/>
     </component>
-    <component id="n34_b7fb" name="btn_continue_game" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="1478,979" size="354,132" group="n7_tjnv">
+    <component id="n34_b7fb" name="btn_continue_game" src="jokm8z" fileName="buttons/Btn_Normol.xml" xy="1426,947" size="345,132" group="n7_tjnv">
       <gearDisplay controller="group" pages="1"/>
-      <relation target="n5_tjnv" sidePair="left-right"/>
+      <relation target="n5_tjnv" sidePair="left-right,top-top"/>
       <Button icon="ui://3z9lj55vsr1dxo"/>
     </component>
-    <group id="n7_tjnv" name="bottom" xy="605,979" size="1227,132" advanced="true">
-      <gearXY controller="group" pages="0,1" values="605,979|605,979"/>
+    <group id="n7_tjnv" name="bottom" xy="658,947" size="1113,132" advanced="true">
+      <gearXY controller="group" pages="0,1" values="658,947|658,947"/>
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n8_tjnv" name="btn_close" src="jokm9z" fileName="buttons/Btn_close.xml" xy="41,31" size="92,111">
@@ -32,7 +30,7 @@
       <relation target="" sidePair="top-top,right-right"/>
     </text>
     <text id="n15_tjnv" name="txt_room_info" xy="224,57" size="610,49" visible="false" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" text="2019/10/07 房号 888888 局数10/16"/>
-    <list id="n26_tjnv" name="player_list" xy="0,217" size="2438,911" touchable="false" layout="row" scroll="horizontal" colGap="414" defaultItem="ui://3z9lj55vjokmey" align="center" vAlign="middle">
+    <list id="n26_tjnv" name="player_list" xy="0,217" size="2438,911" touchable="false" layout="row" scroll="horizontal" colGap="323" defaultItem="ui://3z9lj55vjokmey" align="center" vAlign="middle">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>

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

@@ -24,22 +24,22 @@
     <group id="n4_tjnv" name="title" xy="555,-21" size="1247,199" group="n31_aen8" advanced="true">
       <relation target="" sidePair="center-center,top-top"/>
     </group>
-    <component id="n6_tjnv" name="btn_result_share1" src="qaqf2d" fileName="component/result/component/btn_result_share.xml" xy="94,1903" size="233,91" group="n7_tjnv" visible="false">
+    <component id="n6_tjnv" name="btn_result_share1" src="qaqf2d" fileName="component/result/component/btn_result_share.xml" xy="94,1871" 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="qaqf2f" fileName="component/result/component/btn_result_confirm.xml" xy="2028,1904" size="239,97" group="n7_tjnv" visible="false">
+    <component id="n5_tjnv" name="btn_result_confirm1" src="qaqf2f" fileName="component/result/component/btn_result_confirm.xml" xy="2028,1872" 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="qaqf2h" fileName="component/clearing/zipai_btn_result_share.xml" xy="558,979" size="357,158" group="n7_tjnv">
+    <component id="n41_aen8" name="btn_result_share" src="qaqf2h" fileName="component/clearing/zipai_btn_result_share.xml" xy="558,947" size="357,158" group="n7_tjnv">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <component id="n45_mj9f" name="btn_result_confirm" src="qaqf2i" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="995,979" size="357,158" group="n7_tjnv">
+    <component id="n45_mj9f" name="btn_result_confirm" src="qaqf2i" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="995,947" size="357,158" group="n7_tjnv">
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n42_aen8" name="btn_continue_game" src="qaqf2j" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1430,979" size="357,158" group="n7_tjnv">
+    <component id="n42_aen8" name="btn_continue_game" src="qaqf2j" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1430,947" size="357,158" group="n7_tjnv">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <group id="n7_tjnv" name="bottom" xy="94,979" size="2173,1022" group="n31_aen8"/>
+    <group id="n7_tjnv" name="bottom" xy="94,947" size="2173,1022" group="n31_aen8"/>
     <component id="n46_mj9f" name="btn_close" src="qaqf2l" fileName="component/clearing/btn_result_close.xml" xy="41,32" group="n31_aen8">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
@@ -63,7 +63,7 @@
       <item/>
       <item/>
     </list>
-    <group id="n31_aen8" name="n31" xy="0,-21" size="2348,2022" advanced="true"/>
+    <group id="n31_aen8" name="n31" xy="0,-21" size="2348,1990" advanced="true"/>
     <image id="n12_tjnv" name="n12" src="iu2zbz" fileName="component/EPRHZMui/Frame 787.png" pkg="442j0uep" xy="0,220" size="194,84" group="n14_tjnv"/>
     <text id="n13_tjnv" name="txt_time" xy="0,220" size="194,84" group="n14_tjnv" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" bold="true" text="倍数：5"/>
     <group id="n14_tjnv" name="group_times" xy="0,220" size="194,84" advanced="true">

fk101/wb_new_ui/assets/Main_RunBeardMaJiang/component/clearing/result_zipai_main.xml

@@ -24,22 +24,22 @@
     <group id="n4_tjnv" name="title" xy="539,-21" size="1268,199" 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,970" 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,935" 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="2018,971" 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="2018,936" 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="558,979" size="357,149" group="n7_tjnv">
+    <component id="n41_aen8" name="btn_result_share" src="aen81bs" fileName="component/clearing/zipai_btn_result_share.xml" xy="558,944" size="357,149" group="n7_tjnv">
       <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="995,979" size="357,149" group="n7_tjnv">
+    <component id="n45_mj9f" name="btn_result_confirm" src="mj9f1g0" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="995,944" size="357,149" group="n7_tjnv">
       <relation target="" sidePair="center-center"/>
     </component>
-    <component id="n42_aen8" name="btn_continue_game" src="aen81bq" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1430,979" size="357,149" group="n7_tjnv">
+    <component id="n42_aen8" name="btn_continue_game" src="aen81bq" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1430,944" size="357,149" group="n7_tjnv">
       <relation target="" sidePair="right-right,bottom-bottom"/>
     </component>
-    <group id="n7_tjnv" name="bottom" xy="84,970" size="2173,158" group="n31_aen8"/>
+    <group id="n7_tjnv" name="bottom" xy="84,935" size="2173,158" group="n31_aen8" advanced="true"/>
     <component id="n46_mj9f" name="btn_close" src="mj9f1g1" fileName="component/clearing/btn_result_close.xml" xy="42,31" group="n31_aen8">
       <relation target="" sidePair="left-left,top-top"/>
     </component>
@@ -63,7 +63,7 @@
     <group id="n34_aen8" name="n34" xy="917,127" size="517,37" group="n31_aen8" visible="false" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <group id="n31_aen8" name="n31" xy="0,-21" size="2349,1149" advanced="true"/>
+    <group id="n31_aen8" name="n31" xy="0,-21" size="2349,1147" advanced="true"/>
     <image id="n12_tjnv" name="n12" src="loe74a" fileName="component/EPFLSMui/Frame 787.png" pkg="ypulwxjh" xy="0,220" size="194,84" group="n14_tjnv"/>
     <text id="n13_tjnv" name="txt_time" xy="0,220" size="194,84" group="n14_tjnv" font="ui://27vd145bpxed7ik2" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="倍数：5"/>
     <group id="n14_tjnv" name="group_times" xy="0,220" size="194,84" advanced="true">