同步前提交

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

@@ -13,7 +13,8 @@ function FanPaoFa_ResultView.new(blur_view, index)
         self._blur_view = blur_view
     end
     self._close_zone = false
-
+    self._full = true
+    self._full_offset = false
     self:init("ui://Extend_Poker_FanPaoFa/clearing")
     self.xiPaiCtr = self._view:GetController("xipai")
     return self

wb_new_ui/assets/Extend_Poker_FanPaoFa/component/Main/Qipais.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="42,42">
   <displayList>
-    <loader id="n0_lr5d" name="icon" xy="0,0" pivot="0.5,0.5" size="42,42" autoSize="true"/>
+    <loader id="n0_lr5d" name="icon" xy="0,0" pivot="0.5,0.5" size="42,42" fill="scale" autoSize="true">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
   <transition name="t0">
     <item time="0" type="Scale" target="n0_lr5d" tween="true" startValue="1.5,1.5" endValue="1,1" duration="6"/>

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

@@ -22,11 +22,11 @@
       <item/>
       <item/>
     </list>
-    <text id="n14_pt1r" name="n14" xy="2047,62" size="173,49" group="n19_pt1r" fontSize="36" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="房间号："/>
-    <text id="n15_pt1r" name="tex_roomnum" xy="2221,61" size="299,51" group="n19_pt1r" fontSize="36" color="#ffffff" vAlign="middle" autoSize="none" text="123456&#xA;"/>
+    <text id="n14_pt1r" name="n14" xy="2147,62" size="173,49" group="n19_pt1r" fontSize="36" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="房间号："/>
+    <text id="n15_pt1r" name="tex_roomnum" xy="2323,61" size="157,51" group="n19_pt1r" fontSize="36" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="123456&#xA;"/>
     <text id="n16_pt1r" name="tex_game" xy="2017,8" size="463,49" group="n19_pt1r" fontSize="36" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="娄底放炮罚"/>
-    <text id="n17_pt1r" name="tex_data" xy="1597,61" size="449,56" group="n19_pt1r" fontSize="30" color="#b25116" align="right" vAlign="middle" autoSize="none" text="2017-02-12"/>
-    <group id="n19_pt1r" name="room_info" xy="1597,8" size="923,109" group="n70_dunj"/>
+    <text id="n17_pt1r" name="tex_data" xy="1697,61" size="449,56" group="n19_pt1r" fontSize="36" color="#ffffff" align="right" vAlign="middle" autoSize="none" text="2017-02-12"/>
+    <group id="n19_pt1r" name="room_info" xy="1697,8" size="783,109" group="n70_dunj"/>
     <text id="n49_g8y2" name="n49" xy="473,602" size="457,74" group="n70_dunj" visible="false" fontSize="18" color="#999999" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
       <gearDisplay controller="over" pages="1"/>
     </text>
@@ -84,8 +84,8 @@
     <text id="n88_rbpg" name="WinerID" xy="106,451" size="151,62" group="n44_n1ry" fontSize="46" color="#43633d" align="center" vAlign="middle" autoSize="none" singleLine="true" text="id"/>
     <group id="n44_n1ry" name="n44" xy="30,216" size="339,297" group="n70_dunj"/>
     <image id="n33_n1ry" name="n33" src="ufu92r" fileName="component/clearing/di.png" xy="1246,495" size="1192,295" group="n45_n1ry" visible="false"/>
-    <text id="n31_n1ry" name="111" xy="41,3" size="134,59" group="n45_n1ry" font="Microsoft YaHei" fontSize="32" color="#ffffcc" vAlign="middle" autoSize="none" text="底牌："/>
-    <list id="n32_n1ry" name="dipai_list" xy="43,64" size="889,51" group="n45_n1ry" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://1utjt0r2ufu92s" vAlign="middle"/>
+    <text id="n31_n1ry" name="111" xy="41,23" size="134,69" group="n45_n1ry" font="Microsoft YaHei" fontSize="52" color="#43633d" vAlign="middle" autoSize="none" text="底牌："/>
+    <list id="n32_n1ry" name="dipai_list" xy="179,24" size="713,69" group="n45_n1ry" layout="row" selectionMode="none" overflow="scroll" scroll="horizontal" colGap="5" defaultItem="ui://1utjt0r2ufu92s" vAlign="middle"/>
     <text id="n39_n1ry" name="huxi" xy="1739,368" size="360,74" group="n45_n1ry" fontSize="56" color="#43633d" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="1"/>
     <list id="n46_n1ry" name="fullname_list" xy="1273,138" size="410,446" group="n45_n1ry" selectionMode="none" lineGap="5" colGap="-10" defaultItem="ui://1utjt0r2ufu92t" autoClearItems="true">
       <item/>
@@ -100,7 +100,7 @@
       <item/>
     </list>
     <text id="n42_n1ry" name="score" xy="1737,442" size="364,74" group="n45_n1ry" fontSize="56" color="#43633d" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="1"/>
-    <text id="n56_fnpw" name="222" xy="1920,615" size="82,36" group="n58_fnpw" fontSize="26" color="#b25116" vAlign="middle" text="弃牌："/>
+    <text id="n56_fnpw" name="222" xy="1920,615" size="82,37" group="n58_fnpw" fontSize="26" color="#b25116" vAlign="middle" text="弃牌："/>
     <list id="n62_fnpw" name="qipai_list" xy="1865,250" size="317,163" group="n58_fnpw" layout="row" colGap="1" defaultItem="ui://1utjt0r2ufu929" vAlign="middle">
       <item/>
       <item/>
@@ -117,7 +117,7 @@
     <text id="n68_w06x" name="tili_title" xy="1738,193" size="94,49" group="n45_n1ry" visible="false" fontSize="36" color="#43633d" vAlign="middle" autoSize="none" bold="true" text="1"/>
     <text id="n69_w06x" name="yidashangxian" xy="1737,519" size="344,74" group="n45_n1ry" fontSize="56" color="#43633d" vAlign="middle" autoSize="none" text="1"/>
     <text id="n89_rbpg" name="tili_fan" xy="1740,253" size="272,51" group="n45_n1ry" visible="false" fontSize="36" color="#43633d" vAlign="middle" autoSize="none" bold="true" singleLine="true" text="1"/>
-    <group id="n45_n1ry" name="n45" xy="41,3" size="2397,787" group="n70_dunj" advanced="true">
+    <group id="n45_n1ry" name="n45" xy="41,23" size="2397,767" group="n70_dunj" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
     <component id="n83_gzvy" name="btn_xipai" src="ufu92v" fileName="component/clearing/btn_xp.xml" xy="2059,931" size="400,169" group="n64_pwj4"/>