tongbu

lua_probject/base_project/Game/View/LoginView.lua

@@ -11,6 +11,7 @@ function LoginView.new()
     local self = setmetatable({}, { __index = M })
     self.class = "LoginView"
     self._full = true
+    self._full_offset = false
     self:init()
     return self
 end

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

@@ -132,10 +132,10 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
         end
         local list_residue = self._view:GetChild('list_residue')
         list_residue:RemoveChildrenToPool()
-        for i, v in ipairs(remaincards) do
-            local rc = list_residue:AddItemFromPool()
-            rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
-        end
+        -- for i, v in ipairs(remaincards) do
+        --     local rc = list_residue:AddItemFromPool()
+        --     rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
+        -- end
     end
 
 

wb_new_ui/.objs/metas/2d9xdj6z/naupko.info

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n0_naup": {
+      "hidden": true
+    },
     "n2_naup": {
       "hidden": true
     }

wb_new_ui/assets/Lobby/component/user_info/UserInfo.xml

@@ -3,7 +3,9 @@
   <controller name="nav" pages="0,,1," selected="0"/>
   <controller name="load" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n28_hz87" name="n28" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="1500,930"/>
+    <component id="n28_hz87" name="n28" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="1500,930">
+      <Button title="个人信息"/>
+    </component>
     <image id="n22_cvc8" name="n22" src="vyn37i4y" fileName="component/nav/hengtiao3.png" pkg="m7iejg46" xy="35,116" size="1429,154" group="n16_nld2">
       <relation target="" sidePair="width-width"/>
     </image>
@@ -39,9 +41,8 @@
     <component id="n14_naup" name="n14" src="j046hyj" fileName="component/button/btn_tab.xml" pkg="27vd145b" xy="369,0" visible="false">
       <Button title="代理账号" icon="ui://2d9xdj6znaupkw" selectedIcon="ui://2d9xdj6znaupku" controller="nav" page="1"/>
     </component>
-    <component id="n25_cvc8" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="1383,-16" controller="style,0">
+    <component id="n25_cvc8" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="1384,-15" controller="style,0">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
-    <image id="n30_do1p" name="n30" src="hz877e2c" fileName="images/new/gerenxinxi.png" xy="558,11"/>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/component/user_info/cgm_user_opt.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1428,618" overflow="scroll">
   <displayList>
-    <component id="n0_naup" name="item_real" src="naupkj" fileName="component/user_info/user_opt/iuo_real.xml" xy="0,0" size="1428,100" controller="c1,0">
+    <component id="n0_naup" name="item_real" src="naupkj" fileName="component/user_info/user_opt/iuo_real.xml" xy="0,0" size="1428,100" visible="false" controller="c1,0">
       <relation target="" sidePair="width-width"/>
     </component>
     <component id="n1_naup" name="item_address" src="naupk8" fileName="component/user_info/user_opt/iuo_address.xml" xy="-3,157" size="1428,154" visible="false" controller="c1,0">
@@ -10,7 +10,7 @@
     <component id="n2_naup" name="item_phone" src="naupkk" fileName="component/user_info/user_opt/iuo_phone.xml" xy="0,220" size="1428,98" visible="false" controller="c1,0">
       <relation target="" sidePair="width-width"/>
     </component>
-    <component id="n3_naup" name="item_password" src="naupkn" fileName="component/user_info/user_opt/iuo_password.xml" xy="1,160" size="1428,154" controller="c1,0">
+    <component id="n3_naup" name="item_password" src="naupkn" fileName="component/user_info/user_opt/iuo_password.xml" xy="1,0" size="1428,154" controller="c1,0">
       <relation target="" sidePair="width-width"/>
     </component>
     <component id="n4_naup" name="item_invte" src="naupkp" fileName="component/user_info/user_opt/iuo_invite.xml" xy="2,474" size="1428,98" visible="false" controller="c1,0">

wb_new_ui/assets/Login/Main.xml

@@ -3,7 +3,7 @@
   <controller name="wx" pages="0,,1," selected="0"/>
   <controller name="showLine" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n31_lwcl" name="n31" src="ik9v7i58" fileName="images/bg_main.png" pkg="0khx14ar" xy="-7,0" size="2532,1170">
+    <image id="n31_lwcl" name="n31" src="ik9v7i58" fileName="images/bg_main.png" pkg="0khx14ar" xy="0,0" size="2532,1170">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <loader id="n90_ik9v" name="n90" xy="728,149" size="1076,539" url="ui://0khx14arik9v7i59" align="center" vAlign="middle" fill="scale">
@@ -34,6 +34,7 @@
       <relation target="n85_mljn" sidePair="height-height"/>
     </group>
     <list id="n85_mljn" name="list_show" xy="2302,233" size="176,315" overflow="scroll" defaultItem="ui://2zlli80mmljn7ctd" autoClearItems="true">
+      <gearDisplay controller="showLine" pages="1"/>
       <item title="线路1"/>
       <item/>
       <item/>

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

@@ -4,76 +4,78 @@
   <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="1"/>
-  <controller name="matype" pages="0,,1," selected="1"/>
-  <controller name="matypeshow" pages="0,,1," selected="1"/>
-  <controller name="matypebgshow" pages="0,,1," selected="1"/>
-  <controller name="paixing" pages="0,,1," selected="1"/>
+  <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"/>
   <controller name="xipai" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n110_itp8" name="n110" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="177,24" size="2178,1120"/>
-    <list id="n3_fux2" name="player_list_1" xy="263,177" size="1985,517" group="n29_10imx" lineGap="27" defaultItem="ui://v0j9abjygq7mcu" autoItemSize="false" align="center" vAlign="middle">
+    <list id="n3_fux2" name="player_list_1" xy="262,177" size="1985,517" group="n29_10imx" lineGap="27" defaultItem="ui://v0j9abjygq7mcu" autoItemSize="false" align="center" vAlign="middle">
       <gearDisplay controller="over" pages="0"/>
       <item/>
       <item/>
     </list>
-    <text id="n34_piv9" name="tex_gameinfo" xy="200,43" size="676,72" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" vAlign="middle" autoSize="shrink" text="大夫看见撒地方就阿斯蒂芬啊收到了附件啊收到了附件阿斯蒂芬就撒地方空间撒地方空间撒地方就士大夫看见撒地方就阿斯蒂芬"/>
-    <text id="n35_piv9" name="tex_roominfo" xy="1615,34" size="590,87" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="房号123456 局10/16 2019-10-7 09:24:10&#xA;"/>
-    <group id="n36_piv9" name="room_info" xy="200,34" size="2005,87" group="n29_10imx" advanced="true">
+    <text id="n34_piv9" name="tex_gameinfo" xy="199,43" size="676,72" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" vAlign="middle" autoSize="shrink" text="大夫看见撒地方就阿斯蒂芬啊收到了附件啊收到了附件阿斯蒂芬就撒地方空间撒地方空间撒地方就士大夫看见撒地方就阿斯蒂芬"/>
+    <text id="n35_piv9" name="tex_roominfo" xy="1614,34" size="590,87" group="n36_piv9" font="Microsoft YaHei" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" singleLine="true" text="房号123456 局10/16 2019-10-7 09:24:10&#xA;"/>
+    <group id="n36_piv9" name="room_info" xy="199,34" size="2005,87" group="n29_10imx" advanced="true">
       <relation target="" sidePair=""/>
     </group>
-    <text id="n22_xtwh" name="n22" xy="340,957" size="400,27" group="n29_10imx" visible="false" fontSize="18" color="#624720" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
-    <component id="n12_nrno" name="btn_showResult" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1909,970" size="400,169" group="n29_10imx">
+    <text id="n22_xtwh" name="n22" xy="339,957" size="400,27" group="n29_10imx" visible="false" fontSize="18" color="#624720" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！"/>
+    <component id="n12_nrno" name="btn_showResult" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1908,970" size="400,169" group="n29_10imx">
       <gearDisplay controller="button" pages="1"/>
       <Button icon="ui://27vd145byffn7iq0"/>
     </component>
-    <component id="n4_fux2" name="btn_confirm" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1392,970" size="400,169" group="n28_xhvg">
+    <component id="n62_ona1" name="btn_detal" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1382,886" group="n28_xhvg">
       <gearDisplay controller="button" pages="0"/>
-      <relation target="" sidePair="center-center"/>
-      <Button icon="ui://27vd145byffn7ipc"/>
-    </component>
-    <component id="n62_ona1" name="btn_detal" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1637,653" group="n28_xhvg">
-      <gearDisplay controller="button" pages="0"/>
-      <gearXY controller="paixing" pages="0,1" values="1383,886|1637,653"/>
+      <gearXY controller="paixing" pages="0,1" values="1382,886|1637,653"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mda"/>
     </component>
-    <component id="n104_ux6x" name="btn_fanhuipaixing" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1637,653" group="n28_xhvg">
+    <component id="n104_ux6x" name="btn_fanhuipaixing" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1382,886" group="n28_xhvg">
       <gearDisplay controller="button" pages="0"/>
-      <gearXY controller="paixing" pages="0,1" values="1383,886|1637,653"/>
+      <gearXY controller="paixing" pages="0,1" values="1382,886|1637,653"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mdh"/>
     </component>
-    <component id="n109_nlef" name="btn_xipai" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1911,970" size="400,169" group="n28_xhvg">
+    <component id="n4_fux2" name="btn_confirm" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1391,970" size="400,169" group="n111_tki6">
+      <relation target="" sidePair="center-center"/>
+      <Button icon="ui://27vd145byffn7ipc"/>
+    </component>
+    <component id="n109_nlef" name="btn_xipai" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1910,970" size="400,169" group="n111_tki6">
       <gearDisplay controller="xipai" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://27vd145byffn7iq2"/>
     </component>
-    <group id="n28_xhvg" name="n28" xy="1392,653" size="918,486" group="n24_gfyh" advanced="true">
+    <group id="n111_tki6" name="n111" xy="1391,970" size="919,169" group="n28_xhvg" advanced="true">
+      <gearDisplay controller="button" pages="0"/>
+    </group>
+    <group id="n28_xhvg" name="n28" xy="1382,886" size="928,253" group="n24_gfyh" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
-    <component id="n63_uwvl" name="btn_maima" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1399,884" size="320,105" group="n65_uwvl">
+    <component id="n63_uwvl" name="btn_maima" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1398,884" size="320,105" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mdc"/>
     </component>
-    <component id="n64_uwvl" name="btn_jiangma" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1116,886" size="320,105" group="n65_uwvl">
+    <component id="n64_uwvl" name="btn_jiangma" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1115,886" size="320,105" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mdb"/>
     </component>
-    <component id="n103_e0b9" name="btn_fama" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1399,884" size="320,105" group="n65_uwvl">
+    <component id="n103_e0b9" name="btn_fama" src="gq7mdk" fileName="component/clearing/room/btn_invite(1).xml" xy="1398,884" size="320,105" group="n65_uwvl">
       <gearDisplay controller="matype" pages="1"/>
       <relation target="" sidePair="center-center"/>
       <Button icon="ui://v0j9abjygq7mdg"/>
     </component>
-    <group id="n65_uwvl" name="n65" xy="1116,884" size="603,107" group="n24_gfyh" advanced="true">
+    <group id="n65_uwvl" name="n65" xy="1115,884" size="603,107" group="n24_gfyh" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
-    <group id="n24_gfyh" name="btns" xy="1116,653" size="1194,486" group="n29_10imx" advanced="true">
-      <gearXY controller="over" pages="0,1" values="1116,653|197,638"/>
+    <group id="n24_gfyh" name="btns" xy="1115,884" size="1195,255" group="n29_10imx" advanced="true">
+      <gearXY controller="over" pages="0,1" values="1115,884|197,638"/>
     </group>
-    <group id="n29_10imx" name="n29" xy="200,34" size="2110,1105" advanced="true">
+    <group id="n29_10imx" name="n29" xy="199,34" size="2111,1105" advanced="true">
       <gearDisplay controller="over" pages="0"/>
       <relation target="" sidePair="center-center"/>
     </group>

wb_new_ui/assets/NewGroup/Main_GroupInfo.xml

@@ -13,7 +13,7 @@
     <action type="change_page" fromPage="" toPage="1" objectId="n172_mpll" controller="tip" targetPage="1"/>
   </controller>
   <controller name="show_search" pages="0,,1," selected="0"/>
-  <controller name="more" pages="0,,1," selected="1"/>
+  <controller name="more" pages="0,,1," selected="0"/>
   <controller name="bgchange" pages="0,,1,,3,,4," selected="0"/>
   <displayList>
     <image id="n274_ik9v" name="n274" src="ik9v7ioz" fileName="images/bg_main4.png" xy="0,0">
@@ -94,7 +94,7 @@
     </component>
     <component id="n283_ik9v" name="btn_more" src="cv577inp" fileName="buttons/Btn_CheckBox.xml" pkg="27vd145b" xy="2403,41" size="88,121" group="n291_ik9v">
       <gearDisplay controller="manager" pages="0,1,2,3"/>
-      <Button checked="true" icon="ui://m7iejg46ik9v7ip6" controller="more" page="1"/>
+      <Button icon="ui://m7iejg46ik9v7ip6" controller="more" page="1"/>
     </component>
     <image id="n200_isix" name="member_tips" src="cioehom" fileName="images/info/right_panel/tips.png" xy="2006,34" size="29,31" group="n291_ik9v" visible="false">
       <gearDisplay controller="manager" pages="1,2,3"/>
@@ -134,7 +134,7 @@
     <group id="n294_ik9v" name="buttom_choosePlay" xy="0,989" size="2535,200" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <list id="n45_l0s4" name="lst_room" xy="-2,204" size="2541,731" layout="flow_hz" selectionMode="none" overflow="scroll" scrollBarFlags="2" lineGap="-71" colGap="124" defaultItem="ui://m7iejg46ilon7i9l" align="center" autoClearItems="true">
+    <list id="n45_l0s4" name="lst_room" xy="-2,202" size="2541,731" layout="flow_hz" selectionMode="none" overflow="scroll" scrollBarFlags="2" lineGap="-71" colGap="124" defaultItem="ui://m7iejg46ilon7i9l" align="center" autoClearItems="true">
       <gearDisplay controller="null" pages="0"/>
       <relation target="" sidePair="width-width%,center-center,middle-middle"/>
       <item/>

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

@@ -12,7 +12,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <image id="n60_ik9v" name="n60" src="ik9v7ipe" fileName="images/bg_table_limitScore.png" xy="216,215"/>
-    <text id="n54_hugj" name="tex_limit" xy="220,219" size="45,45" font="ui://27vd145bik9v7ing" fontSize="34" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" bold="true" autoClearText="true" text="33">
+    <text id="n54_hugj" name="tex_limit" xy="220,219" size="45,45" font="ui://27vd145bik9v7ing" fontSize="34" color="#ffffff" align="center" vAlign="middle" leading="0" letterSpacing="1" autoSize="shrink" bold="true" autoClearText="true" text="33">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <component id="n58_ik9v" name="head1" src="hwww2f" fileName="component/Lst_room/Gcm_head.xml" xy="55,31" touchable="false">