家族刷新，解散界面，准备先不用清空手牌

lua_probject/base_project/Game/Controller/Broadcast.lua

@@ -39,6 +39,8 @@ end
 
 BroadcastEvent = {
 
-    OnJoinsChange = 'OnJoinsChange'
+    OnJoinsChange = 'OnJoinsChange',
+    OnMemberChange = "OnMemberChange",
+    OnOutFamily = "OnOutFamily",
 }
 

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -562,7 +562,12 @@ end
 function M:OnMemberOut(evt_data)
     print("收到成员退出推送")
     pt(evt_data)
+    local uid = evt_data.uid
+    local groupId = evt_data.groupId
+    local group = DataManager.groups:get(groupId)
+    group:delMember(uid)
     DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyMemberOut, evt_data)
+    Broadcast.Send(BroadcastEvent.OnMemberChange)
 end
 
 function M:OnMemberOnline(evt_data)

lua_probject/base_project/Game/View/DismissRoomWindow.lua

@@ -22,6 +22,7 @@ function M:init(url)
     BaseWindow.init(self,url)
     local view = self._view
     self.tex_time = view:GetChild("tex_time")
+    self.tex_time2 = view:GetChild("tex_time2")
     local _btn_aggree = view:GetChild("btn_aggree")
 
 
@@ -50,9 +51,11 @@ function M:FillData(data)
         isHidden = true
     end
     if isHidden then
-        self._view:GetChild("tex_tip").text = string.format("[color=#ff9d02]【%s】[/color]发起了解散房间申请，是否同意？","玩家" .. data.req_p.seat)
+        --self._view:GetChild("tex_tip").text = string.format("[color=#ff9d02]【%s】[/color]发起了解散房间申请，是否同意？","玩家" .. data.req_p.seat)
+        self._view:GetChild("tex_tip").text = string.format("玩家\\[[color=#70401C]%s[/color]]申请解散房间", data.req_p.seat)
     else
-        self._view:GetChild("tex_tip").text = string.format("[color=#ff9d02]【%s】[/color]发起了解散房间申请，是否同意？",data.req_p.self_user.nick_name)
+        --self._view:GetChild("tex_tip").text = string.format("[color=#ff9d02]【%s】[/color]发起了解散房间申请，是否同意？",data.req_p.self_user.nick_name)
+        self._view:GetChild("tex_tip").text = string.format("玩家\\[[color=#70401C]%s[/color]]申请解散房间", data.req_p.self_user.nick_name)
     end
     local ctr_falg = self._view:GetController("falg")
     local lst_player = self._view:GetChild("lst_player")
@@ -66,9 +69,9 @@ function M:FillData(data)
         -- elseif tem.player ~= data.req_p then
             local item = lst_player:AddItemFromPool()
             if isHidden then
-                item:GetChild("tex_name").text = "玩家"..tem.player.seat
+                item:GetChild("tex_name").text = "玩家\\[[color=#70401C]" .. tem.player.seat .. "[/color]]"
             else
-                item:GetChild("tex_name").text = tem.player.self_user.nick_name                 
+                item:GetChild("tex_name").text = "玩家\\[[color=#70401C]" .. tem.player.self_user.nick_name .. "[/color]]"
             end
             local ctr_item_falg = item:GetController("falg")
             ctr_item_falg.selectedIndex = tem.result
@@ -81,7 +84,8 @@ function M:OnUpdate(deltaTime)
         self.time = self.time - deltaTime
         self.time = math.max(0,  self.time)
     end
-    self.tex_time.text = tostring(math.floor(self.time))
+    self.tex_time.text = tostring(math.floor(self.time)) .. "s"
+    self.tex_time2.text = tostring(math.floor(self.time))
 end
 
 

lua_probject/base_project/Game/View/Family/FamilyEventView.lua

@@ -139,7 +139,6 @@ function M:_evtNewMailTip(...)
     print("family event _evtNewMailTip")
 end
 
-
 function M:_evtOnNewApply(...)
     print("_evtOnNewApply")
     local arg = { ... }
@@ -158,7 +157,6 @@ function M:_evtOnNewApply(...)
     end
 end
 
-
 function M:_evtInviteResponse(...)
     local arg = { ... }
     local invite_id = arg[1]
@@ -286,6 +284,9 @@ function M:_evtOnFamilyReflash(...)
         return
     end
 
+    local gMgr = ControllerManager.GetController(GroupMgrController)
+    local group = DataManager.groups:get(gMgr.groupId)
+
     local arg = { ... }
     local reflashType = arg[1].reflashType
 
@@ -294,7 +295,12 @@ function M:_evtOnFamilyReflash(...)
 
         if DataManager.SelfUser.account_id == uid then
             view:Reflash()
+            return
         end
+
+        group:addMember(arg[1].usersDetail)
+
+        Broadcast.Send(Broadcast.OnMemberChange)
     end
 
     if reflashType == "outFamily" then
@@ -310,9 +316,6 @@ function M:_evtOnFamilyReflash(...)
         local uid = arg[1].uid
         local joins = arg[1].joins
 
-        local gMgr = ControllerManager.GetController(GroupMgrController)
-        local group = DataManager.groups:get(gMgr.groupId)
-
         group.joins = joins
 
         for _, data in pairs(group.joinsData) do

lua_probject/base_project/Game/View/Family/FamilyMyFamily.lua

@@ -36,11 +36,48 @@ local function ChangeFamilyConfig(data, self)
     )
 end
 
+local function QuitFamily(self)
+    local uid = DataManager.SelfUser.account_id
+    local group = DataManager.groups:get(self.groupId)
+    local player = group.memberMap[uid]
+
+    local tips = "确定退出该亲友圈?"
+    if player.lev == 1 then
+        tips = "确定解散该亲友圈?"
+    end
+
+    local tipsWin = MsgWindow.new(self._view, tips, MsgWindow.MsgMode.OkAndCancel)
+    tipsWin.onOk:Add(function()
+        if self.networkSending then
+            ViewUtil.ShowBannerOnScreenCenter("操作中，请稍后。。")
+            return
+        end
+
+        self.networkSending = true
+        local fgCtr = ControllerManager.GetController(NewGroupController)
+        print("发送了退出协议 familyid = ", self.family.id)
+        fgCtr:FG_ExitGroup(self.family.id, function(res)
+            if res.ReturnCode ~= 0 then
+                return
+            end
+            self.networkSending = false
+            Broadcast.Send(BroadcastEvent.OnOutFamily)
+            self:Close()
+        end)
+    end)
+    tipsWin:Show()
+end
+
 function FamilyMyFamily:ReflashJoinsRedPoint()
     local cRedPoint = self.btn_applyMsg:GetController("cRedPoint")
     local tex_redPoint = self.btn_applyMsg:GetChild("tex_redPoint")
 
     local group = DataManager.groups.groupMap[self.groupId]
+    local player = group.memberMap[DataManager.SelfUser.account_id]
+
+    if player.lev == 3 then
+        return
+    end
 
     cRedPoint.selectedIndex = 0
     if group.joins > 0 then
@@ -232,7 +269,7 @@ function FamilyMyFamily:Init()
     end)
 
     self.btn_quitFamily.onClick:Set(function()
-        self.cTips.selectedIndex = 1
+        QuitFamily(self)
     end)
 
     self.btn_quitNotice.onClick:Set(function()

lua_probject/base_project/Game/View/Family/FamilyMyfamilyList.lua

@@ -15,9 +15,18 @@ end
 
 local function RefalshJoinsRedPoint(self)
     for i = 0, self.list_familys.numItems - 1 do
-
         local groups = DataManager.groups.groupList
         local group = groups[i + 1]
+        local player = group.memberMap[DataManager.SelfUser.account_id]
+
+        if player.lev == 3 then
+            return
+        end
+
+        local redPointNum = self._group.joins
+        if redPointNum > 99 then
+            redPointNum = "99+"
+        end
 
         local obj = self.list_familys:GetChildAt(i)
 
@@ -69,6 +78,7 @@ end
 
 function FamilyMyfamilyList:Show()
     Broadcast.AddListener(BroadcastEvent.OnJoinsChange, RefalshJoinsRedPoint, self)
+    Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Refalsh, self)
 
     HideMainView(self)
     self:Refalsh()
@@ -77,6 +87,7 @@ end
 
 function FamilyMyfamilyList:Close()
     Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, RefalshJoinsRedPoint)
+    Broadcast.RemoveListener(BroadcastEvent.OnOutFamily, self.Refalsh)
 
     ShowMainView(self)
     BaseView.Close(self)

lua_probject/base_project/Game/View/FamilyView.lua

@@ -45,15 +45,24 @@ local function ReflashJoinsRedPoint(self)
     local btn_myfamilycRedPoint = btn_myfamily:GetController("cRedPoint")
     local btn_myfamilyRedPointText = btn_myfamily:GetChild("tex_redPoint")
 
-    local group = DataManager.groups:get(self._group.id)
+    local _joins = 0
+
+    for _, group in pairs(DataManager.groups.groupList) do
+        local player = group.memberMap[DataManager.SelfUser.account_id]
+
+        if player.lev ~= 3 then
+            _joins = _joins + group.joins
+            return
+        end
+    end
 
     btn_myfamilycRedPoint.selectedIndex = 0
-    if group.joins > 0 then
+    if _joins > 0 then
         btn_myfamilycRedPoint.selectedIndex = 1
     end
 
-    local RpTex = group.joins
+    local RpTex = _joins
-    if group.joins > 99 then
+    if _joins > 99 then
         RpTex = "99+"
     end
 
@@ -228,8 +237,6 @@ function M:Reflash()
             self:JoinFamily(true)
             self.btn_chatRoom.visible = false
         end
-
-        --Broadcast.Send(BroadcastEvent.OnJoinsChange)
     end)
 end
 
@@ -376,6 +383,12 @@ function M:UpdataRedPointAuditNumber(obj)
         return
     end
 
+    local player = self._group.memberMap[DataManager.SelfUser.account_id]
+
+    if player.lev == 3 then
+        return
+    end
+
     local redPointNum = self._group.joins
     if redPointNum > 99 then
         redPointNum = "99+"
@@ -1107,12 +1120,16 @@ end
 
 function M:Show()
     Broadcast.AddListener(BroadcastEvent.OnJoinsChange, ReflashJoinsRedPoint, self)
+    Broadcast.AddListener(BroadcastEvent.OnMemberChange, self.ReflashMember, self)
+    Broadcast.AddListener(BroadcastEvent.OnOutFamily, self.Reflash, self)
 
     BaseView.Show(self)
 end
 
 function M:Close()
     Broadcast.RemoveListener(BroadcastEvent.OnJoinsChange, ReflashJoinsRedPoint)
+    Broadcast.RemoveListener(BroadcastEvent.OnMemberChange, self.ReflashMember)
+    Broadcast.RemoveListener(BroadcastEvent.OnOutFamily, self.Reflash)
 
     print("家族界面退出")
     self._familyEventView:RemoveAll()

lua_probject/base_project/Game/View/LobbyView.lua

@@ -452,12 +452,15 @@ function M:Show()
     local user = DataManager.SelfUser
     local tem = user.notices
     if user.group_id ~= 0 then
+        self:ReconnectRoom(user.group_id)
+        --[[
         local msg_tip = MsgWindow.new(self._root_view, "还在圈子的房间中，现在重连吗？", MsgWindow.MsgMode.OkAndCancel)
         msg_tip.onOk:Add(function()
             self:ReconnectRoom(user.group_id)
         end)
         msg_tip:Show()
         tem.auto_show = false
+        ]]
     else
         local lobbyCtr1 = ControllerManager.GetController(LoddyController)
         lobbyCtr1:UpdateNotice(DataManager.SelfUser.account_id, function(result, data)

lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua

@@ -230,6 +230,7 @@ function M:EventInit()
             info:MarkBank(p.seat == _room.banker_seat)
             info:Ready(false)
             local card_info = self._player_card_info[self:GetPos(p.seat)]
+            card_info:Clear()
             card_info:UpdateHandCard()
         end
     end)
@@ -436,6 +437,7 @@ function M:EventInit()
         if _room.curren_round ~= _room.room_config.round then
             -- if #niao == 0 then self._view:GetChild("n13").visible = false end
             self._clearingView:InitData(0, _room, result, nil, function(...)
+                --[[
                 for i = 1, #data do
                     local p = _room:GetPlayerBySeat(data[i].seat)
                     p.total_score = data[i].total_score
@@ -464,7 +466,9 @@ function M:EventInit()
                 DataManager.CurrenRoom.self_player.card_list = {}
                 self._state.selectedIndex = 2
                 self._clearingView = nil
+                ]]
             end)
+            
         end
         -- self._player_card_info[1]:ShowHuTip()
     end)

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

@@ -1,35 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1159,534">
+<component size="1508,898">
   <controller name="falg" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n17_j5s5" name="bg" src="m0eibt" fileName="font/images/win/tkd.png" xy="0,0" size="1159,534">
+    <image id="n18_hy78" name="n18" src="hy787jcd" fileName="images/GameCommon58 1.png" xy="0,0"/>
-      <relation target="" sidePair="width-width,height-height"/>
+    <text id="n11_bt6w" name="n11" xy="94,285" size="217,59" group="n16_fscl" font="ui://27vd145bh35o7il1" fontSize="44" color="#444444" vAlign="middle" autoSize="none" bold="true" text="提示:(超过"/>
-    </image>
+    <text id="n10_bt6w" name="n10" xy="420,285" size="536,59" group="n16_fscl" font="ui://27vd145bh35o7il1" fontSize="44" color="#444444" align="center" vAlign="middle" autoSize="none" bold="true" text="未做出选择，则默认同意）"/>
-    <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="313,285" size="106,59" group="n16_fscl" font="ui://27vd145bh35o7il1" fontSize="44" color="#444444" align="center" vAlign="middle" autoSize="none" bold="true" text="180s"/>
-    <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="94,285" size="862,59"/>
-    <group id="n16_fscl" name="n16" xy="474,73" size="204,43"/>
+    <text id="n0_pgy9" name="tex_tip" xy="94,220" size="1010,65" font="ui://27vd145bh35o7il1" fontSize="44" color="#444444" vAlign="middle" ubb="true" autoSize="none" bold="true" text="玩家\[[color=#70401C]天线宝宝[/color]]申请解散房间"/>
-    <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]发起了解散房间申请，是否同意？"/>
+    <list id="n13_bt6w" name="lst_player" xy="94,344" size="1003,290" touchable="false" overflow="scroll" colGap="17" defaultItem="ui://27vd145bbt6w96" autoClearItems="true">
-    <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">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n7_bt6w" name="btn_aggree" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="257,418" group="n14_bt6w">
+    <component id="n7_bt6w" name="btn_aggree" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="859,655" size="386,151" group="n14_bt6w">
-      <Button title=" " icon="ui://27vd145bbt6w93"/>
+      <Button title=" " icon="ui://27vd145bhy787jce"/>
     </component>
-    <component id="n8_bt6w" name="btn_reject" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="606,418" group="n14_bt6w">
+    <component id="n8_bt6w" name="btn_reject" src="eeqmcgp" fileName="buttons/Btn_Common.xml" xy="263,655" size="386,151" group="n14_bt6w">
-      <Button title=" " icon="ui://27vd145bbt6w94"/>
+      <Button title=" " icon="ui://27vd145bhy787jcf"/>
     </component>
-    <group id="n14_bt6w" name="n14" xy="257,418" size="644,103" advanced="true">
+    <group id="n14_bt6w" name="n14" xy="263,655" size="982,151" advanced="true">
       <gearDisplay controller="falg" pages="0"/>
     </group>
+    <image id="n19_hy78" name="n19" src="hy787jcg" fileName="images/GameCommon59.png" xy="1359,-24" size="171,159"/>
+    <text id="n20_hy78" name="tex_time2" xy="1398,18" size="98,72" font="ui://27vd145bh35o7il1" fontSize="54" color="#662100" align="center" vAlign="middle" autoSize="none" text="999"/>
   </displayList>
 </component>

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

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="253,50">
+<component size="480,62">
   <controller name="falg" pages="0,,1," selected="0"/>
   <displayList>
-    <text id="n1_bt6w" name="tex_name" xy="3,9" size="198,35" font="Microsoft YaHei" fontSize="25" color="#663300" align="center" vAlign="middle" autoSize="none" bold="true" text="地方的负担对方答"/>
+    <richtext id="n1_bt6w" name="tex_name" xy="0,1" size="299,59" font="ui://27vd145bh35o7il1" fontSize="44" color="#444444" vAlign="middle" ubb="true" autoSize="none" bold="true" text="玩家[天线宝宝]"/>
-    <image id="n3_fscl" name="n3" src="otnw9p" fileName="component/create_room/image/pic08.png" xy="204,9" group="n5_fscl"/>
+    <text id="n6_hy78" name="n6" xy="300,1" size="177,59" group="n5_fscl" font="ui://27vd145bh35o7ilb" fontSize="44" color="#ff0000" vAlign="middle" text="等待选择">
-    <image id="n4_fscl" name="n4" src="otnw9q" fileName="component/create_room/image/pic09.png" xy="204,13" group="n5_fscl">
+      <gearDisplay controller="falg" pages="0"/>
+      <relation target="n1_bt6w" sidePair="right-right"/>
+    </text>
+    <text id="n7_hy78" name="n7" xy="300,1" size="91,59" group="n5_fscl" font="ui://27vd145bh35o7ilb" fontSize="44" color="#ff0000" vAlign="middle" text="同意">
       <gearDisplay controller="falg" pages="1"/>
-    </image>
+      <relation target="n1_bt6w" sidePair="right-right"/>
-    <group id="n5_fscl" name="n5" xy="204,9" size="36,32"/>
+    </text>
+    <group id="n5_fscl" name="n5" xy="300,1" size="177,59"/>
   </displayList>
 </component>

wb_new_ui/assets/Common/package.xml

@@ -2111,6 +2111,10 @@
     <image id="brmc7jca" name="hall_club_common_btntext_queding.png" path="/MyFamily/Image/"/>
     <image id="brmc7jcb" name="Rectangle 113.png" path="/window/Image/" scale="9grid" scale9grid="39,37,82,77"/>
     <font id="fj6f7jcc" name="兰亭黑简.TTF" path="/font/" exported="true" renderMode="" samplePointSize="16"/>
+    <image id="hy787jcd" name="GameCommon58 1.png" path="/images/"/>
+    <image id="hy787jce" name="组 2.png" path="/images/"/>
+    <image id="hy787jcf" name="组 1.png" path="/images/"/>
+    <image id="hy787jcg" name="GameCommon59.png" path="/images/"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2" maxAtlasSize="2048">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml

@@ -2,15 +2,15 @@
 <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="read" pages="0,,1," selected="0"/>
+  <controller name="read" pages="0,,1," selected="1"/>
-  <controller name="offline" pages="0,,1," selected="1"/>
+  <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>
   <controller name="three_win" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="text_color" pages="0,,1," selected="0"/>
   <controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
-  <controller name="cScore" alias="分数飘字" pages="0,,1," selected="1"/>
+  <controller name="cScore" alias="分数飘字" pages="0,,1," selected="0"/>
   <displayList>
     <text id="n47_nkur" name="tuoguanTips" xy="-26,-84" size="184,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
       <gearXY controller="site" pages="2,1" values="-26,-84|154,50" default="-85,-104"/>
@@ -30,7 +30,7 @@
     <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="qmc11ao" fileName="images/gamexzmj_9 1.png" xy="38,166" size="55,65">
+    <image id="n8" name="ready" src="qmc11ao" fileName="images/gamexzmj_9 1.png" xy="38,152" size="55,65">
       <gearDisplay controller="read" pages="1"/>
       <relation target="" sidePair="top-bottom"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/PlayerHead2_2.xml

@@ -2,7 +2,7 @@
 <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="read" pages="0,,1," selected="0"/>
+  <controller name="read" pages="0,,1," selected="1"/>
   <controller name="offline" pages="0,,1," selected="0"/>
   <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>
@@ -10,7 +10,7 @@
   <controller name="ting" pages="0,,1," selected="0"/>
   <controller name="text_color" pages="0,,1," selected="0"/>
   <controller name="site" pages="2,normol,0,2-1,1,2-2" selected="0"/>
-  <controller name="cScore" pages="0,,1," selected="1"/>
+  <controller name="cScore" pages="0,,1," selected="0"/>
   <displayList>
     <text id="n47_nkur" name="tuoguanTips" xy="-85,-84" size="302,48" fontSize="22" color="#ff0000" align="center" vAlign="middle" autoSize="none" text="开启托管剩余时间">
       <gearXY controller="site" pages="2,1" values="-85,-84|154,50" default="-85,-104"/>
@@ -27,7 +27,7 @@
       <relation target="" sidePair="width-width,height-height"/>
     </image>
     <group id="n33_e7qn" name="n33" xy="0,0" size="139,139"/>
-    <image id="n8" name="ready" src="qmc11ao" fileName="images/gamexzmj_9 1.png" xy="38,166" size="55,65">
+    <image id="n8" name="ready" src="qmc11ao" fileName="images/gamexzmj_9 1.png" xy="38,152" size="55,65">
       <gearDisplay controller="read" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </image>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -6,10 +6,11 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
-  <controller name="more" pages="0,,1," selected="1"/>
+  <controller name="more" pages="0,,1," selected="0"/>
   <controller name="witness" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
   <displayList>
+    <component id="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1219,384" size="435,73"/>
     <component id="n81_l2u4" name="cardbox" src="gq7m5e" fileName="Main_style_2/turn/Gcm_box_4.xml" xy="1281,-296" pivot="0.5,0.5">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="3d" pages="0,1" values="1281,-296|603,254"/>
@@ -156,9 +157,9 @@
       <Button icon="ui://v0j9abjyu63319u"/>
     </component>
     <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2172,12" size="141,117" group="n138_lu84"/>
-    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,18" pivot="0.5,0.5" size="108,96" group="n138_lu84" rotation="180">
+    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,18" pivot="0.5,0.5" size="108,96" group="n138_lu84">
       <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
-      <Button checked="true" icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
+      <Button icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
     </component>
     <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,47" pivot="0.5,0.5" size="102,91" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
@@ -260,6 +261,5 @@
       <relation target="" sidePair="center-center"/>
     </component>
     <group id="n59_v38k" name="huifang" xy="0,848" size="2532,165"/>
-    <component id="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1219,384" size="435,73"/>
   </displayList>
 </component>