界面修改，聊天室协议

2025-07-02 17:19:20 +08:00 · 2025-07-02 17:19:20 +08:00 · c20f0a127a
parent 8bc488315b
commit c20f0a127a
21 changed files with 170 additions and 60 deletions
--- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua
+++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua
@ -13,6 +13,7 @@ GroupMgrEvent = {
    UpdateGroup = "UpdateGroup",
    NewMailTip = "NewMailTip",
    InviteResponse = "InviteResponse",
+    IsOpenChatRoom = "IsOpenChatRoom",
 }

 GroupMgrController = {
@ -346,6 +347,7 @@ end
 function M:FG_Isopen_ChatRoom(evt_data)
    print("收到是否开启聊天室推送")
    pt(evt_data)
+    DispatchEvent(self._dispatcher, GroupMgrEvent.IsOpenChatRoom, evt_data)
 end

 function M:PopEvent()
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua
@ -133,9 +133,9 @@ function M:FG_TopGroup(group_id, top, callback)
    end)
 end

-function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, apply, ban_chat1, ban_chat2, option, showNum, wechatId,
-                              callback)
+function M:FG_UpdateGroupInfo(data, callback)
    local _client = ControllerManager.GroupClient
+    --[[
    local data = {}
    data.id = id
    data.name = name
@ -149,6 +149,45 @@ function M:FG_UpdateGroupInfo(id, name, notice, ban, dissolve_opt, kick_opt, app
    data.option = option
    data.show_num = showNum
    data.wechatId = wechatId
+    ]]
+    local group = DataManager.groups.groupMap[data.id]
+    data.name = data.name or group.name
+    data.notice = data.notice or group.notice
+    --data.ban = data.ban or group.ban
+    data.dissolve_opt = data.dissolve_opt or group.dissolve_opt
+    data.kick_opt = data.kick_opt or group.kick_opt
+    --data.ban_apply = data.ban_apply or group.apply
+    --data.ban_chat1 = data.ban_chat1 or group.ban_chat1
+    --data.ban_chat2 = data.ban_chat2 or group.ban_chat2
+    data.option = data.option or group.option
+    data.show_num = data.show_num or group.show_num
+    data.wechatId = data.wechatId or group.wechatId
+
+    if data.ban == nil then
+        data.ban = group.ban
+    end
+
+    if data.ban_chat1 == nil then
+        data.ban_chat1 = group.ban_chat1
+        if group.ban_chat1 == nil then
+            data.ban_chat1 = 0
+        end
+    end
+
+    if data.ban_chat2 == nil then
+        data.ban_chat2 = group.ban_chat2
+        if group.ban_chat2 == nil then
+            data.ban_chat2 = 0
+        end
+    end
+
+    if data.ban_apply == nil then
+        data.ban_apply = group.ban_apply
+        if group.ban_apply == nil then
+            data.ban_apply = 0
+        end
+    end
+
    print("FG_UpdateGroupInfo")
    pt(data)
    _client:send(Protocol.WEB_FG_UPDATE_GROUP_INFO, data, function(res)
--- a/lua_probject/base_project/Game/Controller/NewGroupController.lua.rej
+++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua.rej
@ -0,0 +1,10 @@
+diff a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua	(rejected hunks)
+@@ -147,6 +147,8 @@
+     data.ban_chat2 = ban_chat2
+     data.option = option
+     data.show_num = showNum
+    print("FG_UpdateGroupInfo")
+    pt(data)
+     _client:send(Protocol.WEB_FG_UPDATE_GROUP_INFO, data, function(res)
+         callback(res)
+     end)
--- a/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyBanDesk.lua
@ -43,7 +43,6 @@ end
 local function AllUid(deskList)

    local re = {}
-    pt(deskList)
    for _, player in pairs(deskList) do 
        re[#re + 1] = player.uid
    end
--- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua
@ -21,6 +21,7 @@ function FamilyEventView.new(root)
    mgr_ctr:AddEventListener(GroupMgrEvent.UpdateGroup, handler(self, self._evtUpdateGroup))
    mgr_ctr:AddEventListener(GroupMgrEvent.NewMailTip, handler(self, self._evtNewMailTip))
    mgr_ctr:AddEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse))
+    mgr_ctr:AddEventListener(GroupMgrEvent.IsOpenChatRoom, handler(self, self._evtInviteResponse))
    return self
 end

@ -120,4 +121,11 @@ function M:_evtInviteResponse(...)
    imv:Show()
 end

+function M:_evtIsOpenChatRoom(...)
+    local arg = { ... }
+    
+    print("_evtIsOpenChatRoom")
+    pt(arg)
+end
+
 return M
--- a/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
+++ b/lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua
@ -20,6 +20,30 @@ end

 local function ChangeFamilyConfig(data, self)
    local fgCtr = ControllerManager.GetController(NewGroupController)
+    fgCtr:FG_UpdateGroupInfo(data,
+        function(res)
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "更改失败,请稍后再试")
+            else
+                ViewUtil.ErrorTip(res.ReturnCode, "修改成功！")
+                self.family.id = data.id or self.family.id
+                self.family.name = data.name or self.family.name
+                self.family.notice = data.notice or self.family.notice
+                self.family.ban = data.ban or not self.family.ban
+                self.family.dissolve_opt = data.dissolve_opt or self.family.dissolve_opt
+                self.family.kick_opt = data.kick_opt or self.family.kick_opt
+                self.family.apply = data.apply or self.family.apply
+                self.family.ban_chat1 = data.ban_chat1 or self.family.ban_chat1
+                self.family.ban_chat2 = data.ban_chat2 or self.family.ban_chat2
+                self.family.option = data.option or self.family.option
+                self.family.show_num = data.show_num
+                self.family.wechatId = data.wechatId
+                self:Refalsh()
+                self.cWindow.selectedIndex = 0
+            end
+        end
+    )
+    --[[
    fgCtr:FG_UpdateGroupInfo(
        data.id or self.family.id,
        data.name or self.family.name,
@ -40,7 +64,7 @@ local function ChangeFamilyConfig(data, self)
                ViewUtil.ErrorTip(res.ReturnCode, "修改成功！")
                self.family.id = data.id or self.family.id
                self.family.name = data.name or self.family.name
-                self.family.text = data.notice or self.family.text
+                self.family.notice = data.notice or self.family.notice
                self.family.ban = data.ban or not self.family.ban
                self.family.dissolve_opt = data.dissolve_opt or self.family.dissolve_opt
                self.family.kick_opt = data.kick_opt or self.family.kick_opt
@ -55,6 +79,7 @@ local function ChangeFamilyConfig(data, self)
            end
        end
    )
+        ]]
 end


@ -154,13 +179,7 @@ function FamilyMyFamily:Init()
    self.cWindow = self._view:GetController("cWindow")
    self.cDisplayNumber = self._view:GetController("cDisplayNumber")

-    --pt(FairyGUI)
-    --pt(System)
-    --self.input_text.emojies = FguiEmojiDict.EmojiesDict
-
    self.btn_playSet.onClick:Set(function()
-        --self:Close()
-        --BaseWindow.DestroyAll()
        local curView = ViewManager.GetCurrenView()
        if curView.class == "FamilyMainView" then
            curView:PlayEdit()
@ -177,7 +196,6 @@ function FamilyMyFamily:Init()
    end)

    self.btn_buyCrad.onClick:Set(function()
-        --BaseWindow.DestroyAll()
        local curView = ViewManager.GetCurrenView()
        if curView.class == "FamilyMainView" then
            curView:ShowShop()
@ -194,10 +212,6 @@ function FamilyMyFamily:Init()
    end)

    self.btn_checkNumber.onClick:Set(function()
-        --self:Close()
-        --root:OpenAllNumber(self.family)
-
-        --BaseWindow.DestroyAll()
        local curView = ViewManager.GetCurrenView()
        if curView.class == "FamilyMainView" then
            curView:OpenAllNumber(self.family)
@ -209,10 +223,6 @@ function FamilyMyFamily:Init()
    end)

    self.btn_applyMsg.onClick:Set(function()
-        --self:Close()
-        --root:AuditNumber()
-
-        --BaseWindow.DestroyAll()
        local curView = ViewManager.GetCurrenView()
        if curView.class == "FamilyMainView" then
            curView:AuditNumber()
@ -245,17 +255,32 @@ function FamilyMyFamily:Init()
    end)

    self.btn_editNotice.onClick:Set(function()
-        self.changeCallback = function() ChangeFamilyConfig({ notice = self.input_text.text }, self) end
+        self.changeCallback = function()
+            ChangeFamilyConfig({
+                id = self.family.id,
+                notice = self.input_text.text
+            }, self)
+        end
        self.cWindow.selectedIndex = 1
    end)

    self.btn_editName.onClick:Set(function()
-        self.changeCallback = function() ChangeFamilyConfig({ name = self.input_text.text }, self) end
+        self.changeCallback = function()
+            ChangeFamilyConfig({
+                id = self.family.id,
+                name = self.input_text.text
+            }, self)
+        end
        self.cWindow.selectedIndex = 1
    end)

    self.btn_editWx.onClick:Set(function()
-        self.changeCallback = function() ChangeFamilyConfig({ wechatId = self.input_text.text }, self) end
+        self.changeCallback = function()
+            ChangeFamilyConfig({
+                id = self.family.id,
+                wechatId = self.input_text.text
+            }, self)
+        end
        self.cWindow.selectedIndex = 1
    end)

--- a/lua_probject/base_project/Game/View/FamilyView.lua
+++ b/lua_probject/base_project/Game/View/FamilyView.lua
@ -266,6 +266,21 @@ end

 function M:BanFamily()
    local fgCtr = ControllerManager.GetController(NewGroupController)
+    local data = { 
+        id = self._group.id,
+        ban = not self._group.ban 
+        }
+    fgCtr:FG_UpdateGroupInfo(data,
+        function(res)
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "一键打样失败")
+            else
+                self._group.ban = not self._group.ban
+                self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
+                self:RefalshMoreBtn()
+            end
+        end)
+    --[[
    fgCtr:FG_UpdateGroupInfo(self._group.id, self._group.name, "", not self._group.ban, self._group.dissolve_opt,
        self._group.kick_opt, self._group.apply, self._group.ban_chat1, self._group.ban_chat2, self._group.option, 0,
        function(res)
@ -274,7 +289,7 @@ function M:BanFamily()
            else
                self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0
            end
-        end)
+        end)]]
 end

 function M:BanDeskmate()
@ -799,6 +814,14 @@ function M:RefalshMoreBtn()
    end
    MORE_LIST[5].name = tex

+    local tex = ""
+    if self._group.ban then 
+        tex = "一键开启"
+    else
+        tex = "一键打烊"
+    end
+    MORE_LIST[1].name = tex
+
    self:ChangeMore()
 end

--- a/lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/GroupMngSettingView.lua
@ -64,15 +64,16 @@ function M:FillView()

    self._view:GetChild("btn_ok").onClick:Set(function()
        ViewUtil.ShowModalWait()
-        local gid = self.group_id
-        local name = tex_name.text
-        local notice = tex_notice.text
-        local ban = ctr_ban.selectedIndex == 1
-        local dissolve_opt = ctr_dissolve_time.selectedIndex + 1
-        local kick_opt = ctr_kick_time.selectedIndex + 1
-        local apply = ctr_alliance.selectedIndex == 1 and ctr_apply.selectedIndex or 0
-        local ban_chat1 = not btn_chat_input.selected
-        local ban_chat2 = not btn_chat_voice.selected
+        local data = {}
+        data.id = self.group_id
+        data.name = tex_name.text
+        data.notice = tex_notice.text
+        data.ban = ctr_ban.selectedIndex == 1
+        data.dissolve_opt = ctr_dissolve_time.selectedIndex + 1
+        data.kick_opt = ctr_kick_time.selectedIndex + 1
+        data.apply = ctr_alliance.selectedIndex == 1 and ctr_apply.selectedIndex or 0
+        data.ban_chat1 = not btn_chat_input.selected
+        data.ban_chat2 = not btn_chat_voice.selected
        local fgCtr = ControllerManager.GetController(NewGroupController)

        local pt = ctr_pt.selectedIndex
@ -102,7 +103,7 @@ function M:FillView()
            end
        end    

-        fgCtr:FG_UpdateGroupInfo(gid, name, notice, ban, dissolve_opt, kick_opt, apply, ban_chat1, ban_chat2, option,showNum, function(res)
+        fgCtr:FG_UpdateGroupInfo(data, function(res)
            ViewUtil.CloseModalWait()
            if res.ReturnCode ~= 0 then
                ViewUtil.ErrorTip(res.ReturnCode,"设置大联盟失败。")
--- a/wb_new_ui/assets/Family/Main.xml
+++ b/wb_new_ui/assets/Family/Main.xml
@ -8,7 +8,7 @@
  <controller name="showChooseTime" pages="0,,1," selected="0"/>
  <controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
  <controller name="moreBtn" pages="0,,1," selected="0"/>
-  <controller name="familyBan" pages="0,,1," selected="0"/>
+  <controller name="familyBan" pages="0,,1," selected="1"/>
  <controller name="cMyfamilyList" pages="0,,1," selected="0"/>
  <controller name="cIsChatRoom" pages="0,,1," selected="0">
    <remark page="0" value="关闭聊天室"/>
@ -100,19 +100,19 @@
      <item/>
      <item/>
    </list>
+    <component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="573,1028" group="n34_86ct">
+      <relation target="" sidePair="left-left,bottom-bottom"/>
+    </component>
    <text id="n364_jrro" name="n364" xy="1569,301" size="204,56" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="42" color="#444444" text="dangqian">
      <relation target="n28_in3i" sidePair="center-center,bottom-top"/>
    </text>
-    <graph id="n371_ajr3" name="bh_ban" xy="860,297" size="1644,814" group="n34_86ct" type="rect" lineSize="0" fillColor="#66000000">
+    <graph id="n371_ajr3" name="bh_ban" xy="490,288" size="2006,830" group="n34_86ct" type="rect" lineSize="0" fillColor="#66000000">
      <gearDisplay controller="familyBan" pages="1"/>
      <relation target="" sidePair="height-height,left-left%"/>
    </graph>
    <text id="n372_ajr3" name="text_banMain" xy="1375,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打样">
      <gearDisplay controller="familyBan" pages="1"/>
    </text>
-    <component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="573,1028" group="n34_86ct">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-    </component>
    <component id="n391_j0cy" name="com_chatRoom" src="ieus7d1d" fileName="ChatRoom/com_chatRoom.xml" xy="0,0" group="n34_86ct">
      <gearDisplay controller="cIsChatRoom" pages="1"/>
      <relation target="" sidePair="width-width,height-height"/>
--- a/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml
+++ b/wb_new_ui/assets/Family/NumberRecord/comp_numberRecord.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="page" pages="0,,1,,2,,3," selected="3"/>
+  <controller name="page" pages="0,,1,,2,,3," selected="0"/>
  <controller name="day" pages="0,,1," selected="0"/>
  <controller name="sort" pages="0,,1," selected="0"/>
  <controller name="limitDay" pages="0,,1," selected="0"/>
  <controller name="noPeople" pages="0,,1," selected="0"/>
  <displayList>
-    <text id="n0_lgoh" name="text_titleRecord" xy="264,22" size="2002,102" group="n73_lgoh" font="ui://27vd145bh35o7iju" fontSize="78" color="#fbdf74" align="center" autoSize="none" shadowColor="#9a3908" shadowOffset="3,2" text="亲友圈xxxx（123456）成员记录">
+    <text id="n0_lgoh" name="text_titleRecord" xy="264,22" size="2002,102" group="n73_lgoh" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" autoSize="none" shadowColor="#4c5058" shadowOffset="3,3" text="亲友圈xxxx（123456）成员记录">
      <relation target="" sidePair="center-center"/>
    </text>
    <image id="n1_lgoh" name="n1" src="mc627d05" fileName="Main/Image/Rectangle 91.png" xy="23,193" size="2484,960" group="n4_lgoh"/>
@ -41,7 +41,7 @@
    <image id="n18_lgoh" name="n18" src="c8pn7d02" fileName="Main/Image/Rectangle 93(1)(1).png" xy="21,145" size="2484,1011" group="n20_lgoh"/>
    <image id="n19_lgoh" name="n19" src="c8pn7d03" fileName="Main/Image/Rectangle 122(1).png" xy="39,161" size="2448,978" group="n20_lgoh"/>
    <group id="n20_lgoh" name="bg_numberRecordRank" xy="21,145" size="2484,1011" group="n63_lgoh"/>
-    <text id="n21_lgoh" name="text_timeRecord" xy="124,199" size="660,72" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="54" color="#0000ed" bold="true" text="2025-04-11-01  18:58:25"/>
+    <text id="n21_lgoh" name="text_timeRecord" xy="124,199" size="604,72" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="54" color="#0000ed" bold="true" text="2025-04-11-01  18:58:25"/>
    <image id="n22_lgoh" name="n22" src="c8pn7czi" fileName="Main/Image/Rectangle 278.png" xy="226,328" size="438,72" group="n47_lgoh"/>
    <text id="n23_lgoh" name="input_numberID" xy="248,328" size="344,72" group="n47_lgoh" fontSize="46" vAlign="middle" autoSize="shrink" bold="true" autoClearText="true" text="123456213" input="true"/>
    <component id="n24_lgoh" name="btn_clearInput" src="qz7i7cwy" fileName="NumberRecord/Component/btn_clearInput.xml" xy="607,352" group="n47_lgoh"/>
@ -67,29 +67,29 @@
    <text id="n32_lgoh" name="n32" xy="700,645" size="286,86" group="n47_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" text="房卡消耗:">
      <relation target="" sidePair="right-left,top-top"/>
    </text>
-    <text id="n33_lgoh" name="n33" xy="198,807" size="160,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="麻将(">
+    <text id="n33_lgoh" name="n33" xy="198,807" size="158,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="麻将(">
      <relation target="" sidePair="left-left"/>
    </text>
-    <text id="n34_lgoh" name="text_score_majiang" xy="356,807" size="121,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
+    <text id="n34_lgoh" name="text_score_majiang" xy="356,807" size="115,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
      <relation target="n33_lgoh" sidePair="left-right"/>
    </text>
    <component id="n35_lgoh" name="btn_changeMJScore" src="qz7i7cws" fileName="NumberDetail/Component/btn_change.xml" xy="984,816" group="n37_lgoh">
      <relation target="n36_lgoh" sidePair="left-right"/>
    </component>
-    <text id="n36_lgoh" name="n36" xy="471,806" size="485,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
+    <text id="n36_lgoh" name="n36" xy="471,806" size="488,86" group="n37_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
      <relation target="n34_lgoh" sidePair="left-right"/>
    </text>
    <group id="n37_lgoh" name="majiang" xy="198,806" size="912,87" group="n47_lgoh"/>
-    <text id="n38_lgoh" name="n38" xy="198,933" size="160,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="扑克(">
+    <text id="n38_lgoh" name="n38" xy="198,933" size="158,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text="扑克(">
      <relation target="" sidePair="left-left"/>
    </text>
-    <text id="n39_lgoh" name="text_score_poker" xy="356,933" size="121,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
+    <text id="n39_lgoh" name="text_score_poker" xy="356,933" size="115,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#0000ed" bold="true" singleLine="true" text="000">
      <relation target="n38_lgoh" sidePair="left-right"/>
    </text>
    <component id="n40_lgoh" name="btn_changePKScore" src="qz7i7cws" fileName="NumberDetail/Component/btn_change.xml" xy="984,942" group="n42_lgoh">
      <relation target="n41_lgoh" sidePair="left-right"/>
    </component>
-    <text id="n41_lgoh" name="n41" xy="471,933" size="485,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
+    <text id="n41_lgoh" name="n41" xy="471,933" size="488,86" group="n42_lgoh" font="Alibaba PuHuiTi 3.0" fontSize="66" color="#a8312f" bold="true" text=")分禁止进入牌局">
      <relation target="n39_lgoh" sidePair="left-right"/>
    </text>
    <group id="n42_lgoh" name="oiker" xy="198,933" size="912,86" group="n47_lgoh"/>
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="132,132" initName="gcm_info">
  <controller name="room_owner" pages="0,,1," selected="0"/>
-  <controller name="bank" pages="0,,1," selected="0"/>
+  <controller name="bank" pages="0,,1," selected="1"/>
  <controller name="read" pages="0,,1," selected="0"/>
  <controller name="offline" pages="0,,1," selected="0"/>
  <controller name="mask_voice" pages="0,,1," selected="0"/>
@ -30,11 +30,11 @@
      <gearDisplay controller="room_owner" pages="1"/>
      <relation target="" sidePair="width-width,height-height"/>
    </image>
-    <image id="n34_u4l2" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="92,2" size="40,43" group="n33_e7qn">
+    <image id="n34_u4l2" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="80,80" size="58,59" group="n33_e7qn">
      <gearDisplay controller="bank" pages="1"/>
-      <relation target="" sidePair="width-width%,height-height%,right-right,top-top"/>
+      <relation target="" sidePair="width-width,height-height"/>
    </image>
-    <group id="n33_e7qn" name="n33" xy="0,0" size="132,132" advanced="true">
+    <group id="n33_e7qn" name="n33" xy="0,0" size="138,139" advanced="true">
      <relation target="" sidePair="width-width,height-height"/>
    </group>
    <image id="n8" name="ready" src="gq7m5y" fileName="font/images/game/game_fonts_01.png" xy="-1,-109">
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="132,132" initName="gcm_info">
  <controller name="room_owner" pages="0,,1," selected="0"/>
-  <controller name="bank" pages="0,,1," selected="0"/>
+  <controller name="bank" pages="0,,1," selected="1"/>
  <controller name="read" pages="0,,1," selected="0"/>
  <controller name="offline" pages="0,,1," selected="0"/>
  <controller name="mask_voice" pages="0,,1," selected="0"/>
@ -27,10 +27,11 @@
    <image id="n6" name="fangzhu" src="gq7m5t" fileName="images/z02.png" xy="0,89" group="n33_e7qn" visible="false">
      <gearDisplay controller="room_owner" pages="1"/>
    </image>
-    <image id="n34_u4l2" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="92,2" group="n33_e7qn">
+    <image id="n34_u4l2" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="81,81" size="58,58" group="n33_e7qn">
      <gearDisplay controller="bank" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
    </image>
-    <group id="n33_e7qn" name="n33" xy="0,0" size="132,132"/>
+    <group id="n33_e7qn" name="n33" xy="0,0" size="139,139"/>
    <image id="n8" name="ready" src="gq7m5y" fileName="font/images/game/game_fonts_01.png" xy="158,32">
      <gearDisplay controller="read" pages="1"/>
    </image>
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="132,132" initName="gcm_info">
  <controller name="room_owner" pages="0,,1," selected="0"/>
-  <controller name="bank" pages="0,,1," selected="0"/>
+  <controller name="bank" pages="0,,1," selected="1"/>
  <controller name="read" pages="0,,1," selected="0"/>
  <controller name="offline" pages="0,,1," selected="0"/>
  <controller name="mask_voice" pages="0,,1," selected="0"/>
@ -27,10 +27,11 @@
    <image id="n6" name="fangzhu" src="gq7m5t" fileName="images/z02.png" xy="0,89" group="n33_e7qn" visible="false">
      <gearDisplay controller="room_owner" pages="1"/>
    </image>
-    <image id="n34_u4l2" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="92,2" group="n33_e7qn">
+    <image id="n34_u4l2" name="zhuang" src="gq7m5u" fileName="images/z01.png" xy="81,81" size="58,58" group="n33_e7qn">
      <gearDisplay controller="bank" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
    </image>
-    <group id="n33_e7qn" name="n33" xy="0,0" size="132,132"/>
+    <group id="n33_e7qn" name="n33" xy="0,0" size="139,139"/>
    <image id="n8" name="ready" src="gq7m5y" fileName="font/images/game/game_fonts_01.png" xy="158,32">
      <gearDisplay controller="read" pages="1"/>
    </image>
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml
@ -132,9 +132,9 @@
      <gearXY controller="state" pages="1,3,4" values="100,796|73,784|71,774" default="739,916"/>
      <relation target="n118_pkx5" sidePair="right-left,top-top"/>
    </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1844,63" size="153,120">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
      <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="0,1,2" values="1189,274|1844,63|1188,274" default="1188,909"/>
+      <gearXY controller="state" pages="0,1,2" values="1189,274|1834,63|1188,274" default="1188,909"/>
      <relation target="" sidePair="center-center,top-top"/>
    </component>
    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1834,63" size="153,132">
--- a/wb_new_ui/assets/Main_Poker/image/NewPoker/Rectangle
+++ b/wb_new_ui/assets/Main_Poker/image/NewPoker/Rectangle
--- a/wb_new_ui/assets/Main_Poker/newcard/di(1).xml
+++ b/wb_new_ui/assets/Main_Poker/newcard/di(1).xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="278,328">
  <displayList>
-    <image id="n1_fwfg" name="n0" src="epn6a5" fileName="image/NewPoker/bg.png" xy="0,0" size="278,328" aspect="true">
+    <image id="n1_fwfg" name="n0" src="g1qetn" fileName="image/NewPoker/Rectangle 273.png" xy="-6,-5" size="286,337" aspect="true">
      <relation target="" sidePair="width-width,height-height"/>
    </image>
  </displayList>
--- a/wb_new_ui/assets/Main_Poker/package.xml
+++ b/wb_new_ui/assets/Main_Poker/package.xml
@ -229,6 +229,7 @@
    <component id="eqmdtk" name="310_1.xml" path="/newcard/3/" exported="true"/>
    <component id="eqmdtl" name="310_2.xml" path="/newcard/3/" exported="true"/>
    <image id="eqmdtm" name="fb.png" path="/newcard/素材/" exported="true"/>
+    <image id="g1qetn" name="Rectangle 273.png" path="/image/NewPoker/"/>
  </resources>
  <publish name="Main_Poker" path="..\wb_unity_pro\Assets\ART\base\main_poker\ui" packageCount="2"/>
 </packageDescription>
--- a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
+++ b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes
+++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes
--- a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png
+++ b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_atlas0.png
--- a/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes
+++ b/wb_unity_pro/Assets/ART/base/main_poker/ui/Main_Poker_fui.bytes