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
@@ -50,46 +51,8 @@ function M:init()
             iOSWXLoginErrorView.new()
             return
         end
-        GameApplication.Instance:SetAppInfo(self:EncodeAppInfo(self._lineData, self._chooseIndex))
-        ViewUtil.ShowModalWait(true, "正在登录游戏...", 2)
-        coroutine.start(function()
-            coroutine.wait(8)
-            if self.isWXCallBackMark then
-                return
-            end
-            ViewUtil.CloseModalWait()
-            ViewUtil.ErrorTip(10000, "微信登录失败！")
-            if GetPlatform() == "iOS" then
-                view:GetController('wx').selectedIndex = 0
-                view:GetChild('btn_ShowLine').visible = false
-            end
-            iOSWXLoginErrorView.new()
-        end)
-        if (not GameApplication.Instance.accountTest) then
-            GameApplication.Instance:WXLogin(handler(self, self.LoginCallBack))
-        else
-            --local ctr_user = view:GetController("user")
 
-            local _tex_unionid = view:GetChild("tex_unionid")
+        self:CallWxLogin()
-
-            local utez = _tex_unionid.text --.. (ctr_user.selectedIndex + 1)
-
-            local _data = {}
-            _data["userId"] = utez
-            local key = "userId"
-            local s, e = pcall(function()
-                Utils.SaveLocalFile(key, json.encode(_data))
-            end)
-            if not s then
-                print("Error:" .. e)
-            end
-            DataManager.SelfUser.acc = utez
-            -- DataManager.SelfUser.acc = utez
-            DataManager.SelfUser.nick_name = utez
-            DataManager.SelfUser.sex = 1
-            DataManager.SelfUser.head_url = ""
-            self:LoginCallBack(0)
-        end
 
         --  end
         -- end)
@@ -288,10 +251,10 @@ function M:QuickLogin()
 end
 
 function M:LoginCallBack(result, data)
-    self.isWXCallBackMark = true
+    -- self.isWXCallBackMark = true
-    print("微信登录返回================================================================")
+    -- print("微信登录返回================================================================")
-    print("result===>"..result)
+    -- print("result===>" .. result)
-    pt(data)
+    -- pt(data)
     if (not result) or result ~= 0 then
         if result == 10 then
             ViewUtil.ShowModalWait(true, nil, 2)
@@ -300,7 +263,8 @@ function M:LoginCallBack(result, data)
         ViewUtil.CloseModalWait()
         return
     end
-
+    ViewUtil.CloseModalWait()
+    PlayerPrefs.SetString("chooseLine", self._chooseIndex - 1)
     if data then
         local jd = json.decode(data)
         pt(jd)
@@ -358,3 +322,56 @@ function M:ReplaceClip1(e, t, i, n)
     t.url = string.format("%s%03d", n, i)
     return i + 6
 end
+
+function M:CallWxLogin(index)
+    local index = index or 0
+    local view = self._view
+
+    GameApplication.Instance:SetAppInfo(self:EncodeAppInfo(self._lineData, self._chooseIndex))
+    ViewUtil.ShowModalWait(true, "正在登录游戏...", 2)
+    coroutine.start(function()
+        coroutine.wait(3)
+        if self.isWXCallBackMark then
+            return
+        end
+        if GetPlatform() == "iOS" then
+            ViewUtil.CloseModalWait()
+            ViewUtil.ErrorTip(10000, "微信登录失败！")
+            view:GetController('wx').selectedIndex = 0
+            view:GetChild('btn_ShowLine').visible = false
+        else
+            if index > 8 then
+                ViewUtil.CloseModalWait()
+                ViewUtil.ErrorTip(10000, "微信登录失败！")
+                iOSWXLoginErrorView.new()
+            else
+                self._chooseIndex = self._chooseIndex % 8 + 1
+                self._view:GetChild('list_show').selectedIndex = self._chooseIndex - 1
+                self:CallWxLogin(index + 1)
+            end
+        end
+    end)
+    if (not GameApplication.Instance.accountTest) then
+        GameApplication.Instance:WXLogin(handler(self, self.LoginCallBack))
+    else
+        local _tex_unionid = view:GetChild("tex_unionid")
+
+        local utez = _tex_unionid.text --.. (ctr_user.selectedIndex + 1)
+
+        local _data = {}
+        _data["userId"] = utez
+        local key = "userId"
+        local s, e = pcall(function()
+            Utils.SaveLocalFile(key, json.encode(_data))
+        end)
+        if not s then
+            print("Error:" .. e)
+        end
+        DataManager.SelfUser.acc = utez
+        -- DataManager.SelfUser.acc = utez
+        DataManager.SelfUser.nick_name = utez
+        DataManager.SelfUser.sex = 1
+        DataManager.SelfUser.head_url = ""
+        self:LoginCallBack(0)
+    end
+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
+        -- for i, v in ipairs(remaincards) do
-            local rc = list_residue:AddItemFromPool()
+        --     local rc = list_residue:AddItemFromPool()
-            rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
+        --     rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
-        end
+        -- end
     end
 
 

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

@@ -2,6 +2,9 @@
   "objectStatus": {
     "n47_ab5p": {
       "collapsed": true
+    },
+    "n45_ab5p": {
+      "collapsed": true
     }
   },
   "adaptiveTest": true,

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

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

wb_new_ui/.objs/workspace.json

@@ -2,25 +2,78 @@
   "libview.firstColumnWidth": 367,
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://v0j9abjygq7med",
+    "ui://m7iejg46ruljhmp",
-    "ui://v0j9abjygq7mcu"
+    "ui://2d9xdj6zngxlckb",
+    "ui://27vd145bko559b"
   ],
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://v0j9abjygq7mcu",
+  "doc.activeDoc": "ui://27vd145bko559b",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "27vd145b",
     "/",
     "27vd145b",
+    "/buttons/",
+    "27vd145b",
+    "/component/",
+    "27vd145b",
+    "/component/share/",
+    "27vd145b",
+    "/font/",
+    "27vd145b",
+    "/font/images/",
+    "27vd145b",
+    "/font/images/btn_keyboard/",
+    "27vd145b",
+    "/font/images/win/",
+    "27vd145b",
     "/images/",
+    "27vd145b",
+    "/images/btn_keyboard/",
+    "27vd145b",
+    "/images/currency/",
+    "27vd145b",
+    "/images/dismiss_room/",
+    "27vd145b",
+    "/images/game/",
+    "27vd145b",
+    "/images/head/",
+    "27vd145b",
+    "/images/head/realname/",
+    "2d9xdj6z",
+    "/",
+    "2d9xdj6z",
+    "/component/",
+    "2d9xdj6z",
+    "/component/user_info/",
+    "2d9xdj6z",
+    "/component/user_info/edit/",
     "v0j9abjy",
     "/",
+    "v0j9abjy",
+    "/component/",
+    "v0j9abjy",
+    "/component/clearing/",
+    "v0j9abjy",
+    "/component/clearing/clearing1/",
     "lx6k641g",
     "/",
     "lx6k641g",
-    "/image/"
+    "/image/",
+    "m7iejg46",
+    "/",
+    "m7iejg46",
+    "/component/",
+    "m7iejg46",
+    "/component/Lst_info/",
+    "m7iejg46",
+    "/component/nav/",
+    "m7iejg46",
+    "/images/",
+    "m7iejg46",
+    "/mgr/"
   ],
   "auxline1": true,
   "snapToGrid": true,

wb_new_ui/assets/Common/Win_ConnectTip.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,286">
   <displayList>
-    <graph id="n5_m0vo" name="n5" xy="-208,0" size="1751,286" type="rect" lineSize="0" fillColor="#b3000000">
+    <graph id="n5_m0vo" name="n5" xy="-1872,-34" size="5000,336" type="rect" lineSize="0" fillColor="#b3000000">
       <relation target="" sidePair="height-height"/>
     </graph>
-    <text id="n7_m0vo" name="tex_message" xy="156,24" size="1022,132" fontSize="35" color="#ffffff" align="center" vAlign="middle" ubb="true" autoSize="none" text="125"/>
+    <text id="n7_m0vo" name="tex_message" xy="157,0" size="1022,132" fontSize="35" color="#ffffff" align="center" vAlign="middle" ubb="true" autoSize="none" text="125"/>
-    <component id="n4_m0vo" name="btn_connect" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="267,173" group="n8_m0vo">
+    <component id="n4_m0vo" name="btn_connect" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="266,193" group="n8_m0vo">
       <Button title=" " icon="ui://27vd145bko559c"/>
     </component>
-    <component id="n6_m0vo" name="btn_back" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="771,173" group="n8_m0vo">
+    <component id="n6_m0vo" name="btn_back" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="770,193" group="n8_m0vo">
       <Button title=" " icon="ui://27vd145bko559d"/>
     </component>
-    <group id="n8_m0vo" name="n8" xy="267,173" size="799,103"/>
+    <group id="n8_m0vo" name="n8" xy="266,193" size="799,103"/>
   </displayList>
 </component>

wb_new_ui/assets/Common/buttons/Btn_menu_h_small.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="298,133" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
     <image id="n4_h2hj" name="n4" src="h2hj7iit" fileName="font/images/xx_button_01_1.png" xy="0,0">
       <gearDisplay controller="button" pages="0"/>
     </image>
-    <image id="n5_h2hj" name="n5" src="h2hj7iiu" fileName="font/images/xx_button_01_2.png" xy="0,0">
+    <image id="n5_h2hj" name="n5" src="h2hj7iiu" fileName="font/images/xx_button_01_2.png" xy="0,0" size="298,133">
       <gearDisplay controller="button" pages="1"/>
     </image>
-    <text id="n2_eeqm" name="title" xy="28,0" size="240,118" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" autoSize="none" bold="true" singleLine="true" autoClearText="true" text="实名">
+    <text id="n2_eeqm" name="title" xy="28,0" size="243,114" font="Microsoft YaHei" fontSize="46" color="#ffffff" vAlign="middle" autoSize="none" bold="true" singleLine="true" autoClearText="true" text="实名">
-      <gearColor controller="button" pages="0,1" values="#ffffff,#000000|#d85617,#000000"/>
+      <gearDisplay controller="button" pages="0"/>
+      <gearColor controller="button" pages="0,1" values="#55774e,#000000|#ffffff,#000000"/>
     </text>
-    <loader id="n3_kz12" name="icon" xy="0,0" size="296,133" touchable="false" fill="scale"/>
+    <loader id="n3_kz12" name="icon" xy="1,0" size="296,133" touchable="false" fill="scale"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

wb_new_ui/assets/Common/package.xml

@@ -492,7 +492,7 @@
     <image id="oviihyx" name="btn_comfirm1.png" path="/font/images/"/>
     <component id="oviihyy" name="Btn_Common1.xml" path="/buttons/"/>
     <font id="oviihyz" name="SIMSUN.TTC" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
-    <image id="oviihz1" name="bg_05.png" path="/font/images/btn_keyboard/" exported="true" scale="9grid" scale9grid="2,2,503,43"/>
+    <image id="oviihz1" name="bg_05.png" path="/font/images/btn_keyboard/" exported="true" scale="9grid" scale9grid="26,21,662,48"/>
     <image id="oviihz2" name="button_04.png" path="/font/images/btn_keyboard/" exported="true"/>
     <image id="oviihz3" name="button_05.png" path="/font/images/btn_keyboard/" exported="true"/>
     <image id="oviihz4" name="button_06.png" path="/font/images/btn_keyboard/" exported="true"/>
@@ -1341,35 +1341,6 @@
     <image id="itp87iqs" name="icon_setting_chooseBG.png" path="/images/" exported="true"/>
     <image id="yffnrs" name="bg_poker_other.png" path="/images/" exported="true" scale="9grid" scale9grid="176,53,352,106"/>
     <image id="yffnrt" name="bg_poker_self.png" path="/images/" exported="true" scale="9grid" scale9grid="176,53,352,106"/>
-    <folder id="/font/font_majiangwin/" name="font_majiangwin" path="/font/" atlas="7"/>
-    <folder id="/font/font_majianlose/" name="font_majianlose" path="/font/" atlas="7"/>
-    <image id="tki67iqt" name="0 - +.png" path="/font/font_majiangwin/"/>
-    <image id="tki67iqu" name="7 - 6.png" path="/font/font_majianlose/"/>
-    <image id="tki67iqv" name="6 - 5.png" path="/font/font_majianlose/"/>
-    <image id="tki67iqw" name="5 - 4.png" path="/font/font_majianlose/"/>
-    <image id="tki67iqx" name="4 - 3.png" path="/font/font_majianlose/"/>
-    <image id="tki67iqy" name="3 - 2.png" path="/font/font_majianlose/"/>
-    <image id="tki67iqz" name="2 - 1.png" path="/font/font_majianlose/"/>
-    <image id="tki67ir0" name="11 - ..png" path="/font/font_majianlose/"/>
-    <image id="tki67ir1" name="10 - 9.png" path="/font/font_majianlose/"/>
-    <image id="tki67ir2" name="1 - 0.png" path="/font/font_majianlose/"/>
-    <image id="tki67ir3" name="0 - -.png" path="/font/font_majianlose/"/>
-    <image id="tki67ir4" name="9 - 8.png" path="/font/font_majiangwin/"/>
-    <image id="tki67ir5" name="8 - 7.png" path="/font/font_majiangwin/"/>
-    <image id="tki67ir6" name="7 - 6.png" path="/font/font_majiangwin/"/>
-    <image id="tki67ir7" name="6 - 5.png" path="/font/font_majiangwin/"/>
-    <image id="tki67ir8" name="5 - 4.png" path="/font/font_majiangwin/"/>
-    <image id="tki67ir9" name="4 - 3.png" path="/font/font_majiangwin/"/>
-    <image id="tki67ira" name="3 - 2.png" path="/font/font_majiangwin/"/>
-    <image id="tki67irb" name="2 - 1.png" path="/font/font_majiangwin/"/>
-    <image id="tki67irc" name="11 - ..png" path="/font/font_majiangwin/"/>
-    <image id="tki67ird" name="10 - 9.png" path="/font/font_majiangwin/"/>
-    <image id="tki67ire" name="1 - 0.png" path="/font/font_majiangwin/"/>
-    <image id="tki67irf" name="8 - 7.png" path="/font/font_majianlose/"/>
-    <image id="tki67irg" name="9 - 8.png" path="/font/font_majianlose/"/>
-    <font id="tki67irh" name="font_majiangwin.fnt" path="/font/font_majiangwin/" exported="true"/>
-    <font id="tki67iri" name="font_majianlose.fnt" path="/font/font_majianlose/" exported="true"/>
-    <image id="tki67irj" name="bg_game_times.png" path="/images/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

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/Lobby/component/user_info/edit/win_edit_nick.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="584,380">
+<component size="865,634">
   <displayList>
-    <image id="n0_ngxl" name="n0" src="ngxlck2" fileName="component/user_info/edit/dk_sz.png" xy="0,0"/>
+    <image id="n0_ngxl" name="n0" src="ngxlck2" fileName="component/user_info/edit/dk_sz.png" xy="0,1" size="865,634"/>
-    <component id="n2_ngxl" name="btn_close" src="ngxlcka" fileName="component/user_info/edit/btn_nick_set.xml" xy="540,-23" size="62,58">
+    <component id="n2_ngxl" name="btn_close" src="ngxlcka" fileName="component/user_info/edit/btn_nick_set.xml" xy="748,-13" size="129,121">
       <Button icon="ui://2d9xdj6zngxlck4"/>
     </component>
-    <graph id="n3_ngxl" name="n3" xy="75,128" size="433,53" type="rect" lineSize="0" fillColor="#ffefe8c8"/>
+    <image id="n8_dhos" name="n8" src="dhos7imz" fileName="component/user_info/edit/nick_input.png" xy="107,228"/>
-    <text id="n4_ngxl" name="tex_edit" xy="87,130" size="410,49" input="true" fontSize="25" color="#976e27" vAlign="middle" autoSize="none" text="修改昵称"/>
+    <text id="n4_ngxl" name="tex_edit" xy="126,243" size="643,76" fontSize="25" color="#ffffff" vAlign="middle" autoSize="none" text="修改昵称" input="true"/>
-    <text id="n5_ngxl" name="n5" xy="252,13" size="80,45" fontSize="36" color="#a04615" align="center" vAlign="middle" bold="true" text="提示"/>
+    <component id="n6_ngxl" name="btn_confirm" src="ngxlcka" fileName="component/user_info/edit/btn_nick_set.xml" xy="241,454" size="376,138">
-    <component id="n6_ngxl" name="btn_confirm" src="ngxlcka" fileName="component/user_info/edit/btn_nick_set.xml" xy="184,256" size="215,68">
       <Button icon="ui://2d9xdj6zngxlck1"/>
     </component>
+    <image id="n7_dhos" name="n7" src="dhos7imy" fileName="component/user_info/edit/nick_title.png" xy="362,25"/>
   </displayList>
 </component>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1500,930">
-  <controller name="nav" pages="0,real,1,address" selected="1"/>
+  <controller name="nav" pages="0,real,1,address" selected="0"/>
   <controller name="update" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n58_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" pkg="27vd145b" xy="0,0" size="1500,930">
@@ -31,18 +31,18 @@
     <image id="n31_ab5p" name="n31" src="ab5p1f" fileName="font/images/btn_keyboard/hall_input_bg.png" pkg="27vd145b" xy="713,397" size="451,94" group="n33_ab5p"/>
     <text id="n32_ab5p" name="tex_identity" xy="738,400" size="413,80" group="n33_ab5p" font="Microsoft YaHei" fontSize="24" color="#367256" vAlign="middle" autoSize="shrink" singleLine="true" text="" input="true" prompt="请输入身份证号码" maxLength="18" restrict="[0-9Xx]" keyboardType="4"/>
     <group id="n33_ab5p" name="n33" xy="713,397" size="451,94" group="n45_ab5p"/>
-    <text id="n41_ab5p" name="n41" xy="399,571" size="1011,90" group="n45_ab5p" font="Microsoft YaHei" fontSize="20" color="#bc0a0a" autoSize="none" text="重要提示：提交认证后不可修改。请提交本人的真是信息，否则将无法参加平台的有奖活动、比赛活动，可能无法接收发送的奖品或快递"/>
+    <text id="n41_ab5p" name="n41" xy="363,540" size="1061,138" group="n45_ab5p" font="Microsoft YaHei" fontSize="32" color="#bc0a0a" autoSize="none" text="重要提示：提交认证后不可修改。请提交本人的真是信息，否则将无法参加平台的有奖活动、比赛活动，可能无法接收发送的奖品或快递"/>
     <component id="n10_r6cy" name="btn_real" src="ab5pcj5" fileName="component/user_info/btn_ok.xml" xy="703,702" size="387,156" group="n45_ab5p"/>
-    <group id="n45_ab5p" name="n45" xy="387,192" size="1023,666" group="n39_ab5p" advanced="true">
+    <group id="n45_ab5p" name="n45" xy="363,192" size="1061,666" group="n39_ab5p" advanced="true">
       <gearDisplay controller="update" pages="0"/>
     </group>
-    <text id="n48_ab5p" name="tex_name1" xy="590,324" size="450,366" group="n47_ab5p" font="Microsoft YaHei" fontSize="20" color="#367256" text="姓名：XXX"/>
+    <text id="n48_ab5p" name="tex_name1" xy="590,324" size="103,29" group="n47_ab5p" font="Microsoft YaHei" fontSize="20" color="#367256" text="姓名：XXX"/>
     <image id="n46_ab5p" name="n46" src="ab5pcjj" fileName="component/user_info/real/mine_real_name_icon.png" xy="657,185" size="457,436" group="n47_ab5p"/>
-    <text id="n49_ab5p" name="tex_identity1" xy="589,357" size="574,366" group="n47_ab5p" font="Microsoft YaHei" fontSize="20" color="#367256" text="身份证号：430XXX3333"/>
+    <text id="n49_ab5p" name="tex_identity1" xy="589,357" size="227,29" group="n47_ab5p" font="Microsoft YaHei" fontSize="20" color="#367256" text="身份证号：430XXX3333"/>
     <group id="n47_ab5p" name="n47" xy="589,185" size="568,538" group="n39_ab5p" advanced="true">
       <gearDisplay controller="update" pages="1"/>
     </group>
-    <group id="n39_ab5p" name="real" xy="387,185" size="1023,673" advanced="true">
+    <group id="n39_ab5p" name="real" xy="363,185" size="1061,673" advanced="true">
       <gearDisplay controller="nav" pages="0"/>
     </group>
     <list id="n40_ab5p" name="lst_play" xy="30,116" size="303,776" overflow="hidden" lineGap="-6" defaultItem="ui://27vd145bab5phy3" selectionController="nav">
@@ -50,5 +50,11 @@
       <item title="实名认证"/>
       <item title="收货地址"/>
     </list>
+    <image id="n60_v3fp" name="n60" src="v3fp7in1" fileName="component/user_info/edit/in_real_address_name.png" xy="58,148">
+      <gearDisplay controller="nav" pages="0"/>
+    </image>
+    <image id="n61_v3fp" name="n61" src="v3fp7in3" fileName="component/user_info/edit/in_real_address_1.png" xy="59,277">
+      <gearDisplay controller="nav" pages="1"/>
+    </image>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/package.xml

@@ -211,7 +211,7 @@
     <image id="fvvtcjz" name="club_img_bg.png" path="/component/group/images/"/>
     <image id="qtr4ck0" name="qr_wx.jpg" path="/component/service/"/>
     <image id="ngxlck1" name="qrxg.png" path="/component/user_info/edit/"/>
-    <image id="ngxlck2" name="dk_sz.png" path="/component/user_info/edit/"/>
+    <image id="ngxlck2" name="dk_sz.png" path="/component/user_info/edit/" scale="9grid" scale9grid="29,24,58,48"/>
     <image id="ngxlck3" name="dk.png" path="/component/user_info/edit/"/>
     <image id="ngxlck4" name="close.png" path="/component/user_info/edit/"/>
     <image id="ngxlck5" name="title.png" path="/component/user_info/edit/"/>
@@ -420,6 +420,10 @@
     <image id="lqkg7imu" name="frame002.png" path="/mgr/imgs/" scale="9grid" scale9grid="114,41,228,82"/>
     <image id="lqkg7imw" name="frame003.png" path="/" scale="9grid" scale9grid="36,35,72,70"/>
     <image id="cdns7imx" name="editor_head.png" path="/component/user_info/edit/"/>
+    <image id="dhos7imy" name="nick_title.png" path="/component/user_info/edit/"/>
+    <image id="dhos7imz" name="nick_input.png" path="/component/user_info/edit/"/>
+    <image id="v3fp7in1" name="in_real_address_name.png" path="/component/user_info/edit/"/>
+    <image id="v3fp7in3" name="in_real_address_1.png" path="/component/user_info/edit/"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="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/NewGroup/Win_CreateGroup.xml

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="978,603">
+<component size="995,605">
   <controller name="index" pages="0,,1,aa,2," selected="0"/>
   <controller name="alliance" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n71_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" pkg="27vd145b" xy="0,0" size="978,603">
+    <image id="n71_nuxq" name="bg" src="nuxq7ije" fileName="font/images/win/bxx_bg_01.png" pkg="27vd145b" xy="0,0" size="995,605">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <component id="n66_s98c" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="894,-1">
+    <component id="n66_s98c" name="btn_close" src="csp47i42" fileName="btnclose.xml" xy="911,-1">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <image id="n67_s98c" name="n67" src="oviihz1" fileName="font/images/btn_keyboard/bg_05.png" pkg="27vd145b" xy="142,214" group="n13_l0s4"/>
     <text id="n10_l0s4" name="tex_name" xy="153,225" size="686,76" group="n13_l0s4" font="Microsoft YaHei" fontSize="28" color="#333333" vAlign="middle" letterSpacing="2" autoSize="none" singleLine="true" text="" input="true" prompt="请输入亲友圈名称" maxLength="8"/>
     <group id="n13_l0s4" name="n13" xy="142,214" size="697,96" advanced="true"/>
-    <component id="n14_l0s4" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="228,459" size="219,76" group="n8_m0vo" scale="0.8,0.8">
+    <component id="n14_l0s4" name="btn_ok" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="176,459" size="315,114" group="n8_m0vo" scale="0.8,0.8">
       <Button title="  " titleColor="#ffffff" titleFontSize="36" icon="ui://27vd145bl2997icd"/>
     </component>
-    <component id="n12_l0s4" name="btn_cal" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="597,459" size="220,76" group="n8_m0vo" scale="0.8,0.8">
+    <component id="n12_l0s4" name="btn_cal" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="580,452" size="310,125" group="n8_m0vo" scale="0.8,0.8">
       <Button title="  " icon="ui://27vd145bcvc87i5s"/>
     </component>
-    <group id="n8_m0vo" name="n8" xy="228,459" size="589,76" advanced="true"/>
+    <group id="n8_m0vo" name="n8" xy="176,452" size="714,125" advanced="true"/>
     <component id="n15_ewd0" name="n15" src="hjonhab" fileName="component/Lst_group/Btn_check.xml" xy="139,351" group="n24_ewd0" visible="false">
       <Button checked="true" title="房主支付" controller="index" page="0"/>
     </component>
@@ -31,6 +31,6 @@
     </component>
     <group id="n24_ewd0" name="n24" xy="139,351" size="755,46" advanced="true"/>
     <image id="n60_nld2" name="n60" src="kxzvhaq" fileName="images/main/w09.png" xy="185,13" visible="false"/>
-    <image id="n69_h2hj" name="n69" src="h2hj7i87" fileName="mgr/imgs/fagpack/qyq_txt_zdyqyq.png" xy="355,6"/>
+    <image id="n69_h2hj" name="n69" src="h2hj7i87" fileName="mgr/imgs/fagpack/qyq_txt_zdyqyq.png" xy="188,-9"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/Win_SelectGames.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1196,690">
+<component size="2034,1038">
   <displayList>
-    <component id="n11_hz87" name="n11" src="st2l7ijp" fileName="component/Win_BaseWindow_H698.xml" pkg="27vd145b" xy="0,0" size="1196,690" group="n12_hz87">
+    <component id="n11_hz87" name="n11" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="2034,1038" group="n12_hz87">
       <Button icon="ui://m7iejg46hz877iok"/>
     </component>
-    <group id="n12_hz87" name="bg" xy="0,0" size="1196,690"/>
+    <group id="n12_hz87" name="bg" xy="0,0" size="2034,1038"/>
-    <list id="n1_8h20" name="lst_allplays" xy="40,117" size="1105,543" group="n6_8h20" overflow="scroll" lineGap="7" defaultItem="ui://m7iejg46kwdo7i98" autoClearItems="true">
+    <list id="n1_8h20" name="lst_allplays" xy="40,117" size="1954,866" group="n6_8h20" overflow="scroll" lineGap="7" defaultItem="ui://m7iejg46kwdo7i98" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -13,13 +13,13 @@
       <item/>
       <item/>
     </list>
-    <text id="n3_8h20" name="n3" xy="112,73" size="124,41" group="n5_8h20" font="Microsoft YaHei" fontSize="30" color="#495f55" vAlign="middle" text="玩法名称"/>
+    <text id="n3_8h20" name="n3" xy="112,35" size="225,73" group="n5_8h20" font="Microsoft YaHei" fontSize="36" color="#495f55" align="center" vAlign="middle" autoSize="none" text="玩法名称"/>
-    <text id="n4_8h20" name="n4" xy="783,71" size="324,41" group="n5_8h20" visible="false" font="Microsoft YaHei" fontSize="30" color="#aa3300" align="center" vAlign="middle" text="操作(勾选即为快速开始)"/>
+    <text id="n4_8h20" name="n4" xy="783,40" size="324,73" group="n5_8h20" visible="false" font="Microsoft YaHei" fontSize="30" color="#aa3300" align="center" vAlign="middle" text="操作(勾选即为快速开始)"/>
-    <group id="n5_8h20" name="n5" xy="112,71" size="995,44" group="n6_8h20"/>
+    <group id="n5_8h20" name="n5" xy="112,35" size="995,78" group="n6_8h20"/>
-    <image id="n2_8h20" name="n2" src="csp47i44" fileName="component/nav/sd.png" xy="20,108" size="1160,0" group="n6_8h20">
+    <image id="n2_8h20" name="n2" src="csp47i44" fileName="component/nav/sd.png" xy="20,108" size="1998,0" group="n6_8h20">
       <relation target="" sidePair="width-width"/>
     </image>
-    <group id="n6_8h20" name="index0" xy="20,71" size="1160,589" advanced="true"/>
+    <group id="n6_8h20" name="index0" xy="20,35" size="1998,948" advanced="true"/>
-    <component id="n7_8h20" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1118,-12" size="79,77" controller="style,0"/>
+    <component id="n7_8h20" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="1910,-13" size="131,127" controller="style,0"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/component/reward/item_partner_banplays.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1100,114">
+<component size="1940,183">
   <controller name="promote" pages="0,,1," selected="0"/>
   <controller name="fandian" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n5_s98c" name="n5" src="vyn37i4y" fileName="component/nav/hengtiao3.png" xy="0,0" size="1100,114"/>
+    <image id="n16_dhos" name="n16" src="dhos7is5" fileName="mgr/component/reward/item_partner_banplays_bg.png" xy="0,0"/>
-    <text id="n1_gls1" name="tex_name" xy="17,19" size="249,71" font="Microsoft YaHei" fontSize="34" color="#495f55" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="一毛转转麻将"/>
+    <text id="n1_gls1" name="tex_name" xy="65,53" size="249,71" font="Microsoft YaHei" fontSize="46" color="#495f55" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="一毛转转麻将"/>
     <component id="n13_kwdo" name="gxbtn_old" src="h1uu3i" fileName="component/create_room/Btn_cr_checkbox2.xml" pkg="27vd145b" xy="940,29" size="62,49" visible="false"/>
-    <text id="n14_avqi" name="tex_display" xy="285,9" size="622,93" fontSize="24" color="#444444" vAlign="middle" autoSize="none" text=""/>
+    <text id="n14_avqi" name="tex_display" xy="392,19" size="1217,145" fontSize="36" color="#917033" vAlign="middle" autoSize="none" text="规则说明"/>
-    <component id="n15_t8gf" name="gxbtn" src="xt5s7iia" fileName="mgr/component/member/partner/btn_mul.xml" xy="919,20" size="174,74">
+    <component id="n15_t8gf" name="gxbtn" src="xt5s7iia" fileName="mgr/component/member/partner/btn_mul.xml" xy="1630,40" size="270,118">
-      <Button icon="ui://m7iejg46t8gf7ikp" selectedIcon="ui://m7iejg46t8gf7ikp"/>
+      <Button icon="ui://m7iejg46dhos7is6" selectedIcon="ui://m7iejg46dhos7is6"/>
     </component>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/package.xml

@@ -1339,6 +1339,8 @@
     <image id="dhos7is1" name="roominfo_bg_1.png" path="/component/Lst_info/" scale="9grid" scale9grid="36,29,72,58"/>
     <image id="dhos7is2" name="roominfo_title.png" path="/component/Lst_info/"/>
     <image id="dhos7is3" name="roominfo_bg_2.png" path="/component/Lst_info/" scale="9grid" scale9grid="33,29,66,58"/>
+    <image id="dhos7is5" name="item_partner_banplays_bg.png" path="/mgr/component/reward/"/>
+    <image id="dhos7is6" name="item_partner_banplays_btnstart.png" path="/mgr/component/reward/"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>