同步

lua_probject/base_project/Game/Controller/GameController.lua

@@ -74,7 +74,7 @@ function M:init(name)
 
     self._eventmap[Protocol.GAME_EVT_EXIT_ROOM_DISMISS] = self.OnEventExitRoomDismiss
     self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM] = self.OnEventDismissRoom
-    self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM_VOTE] = self.OnEventDismissRoomVote
+    --self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM_VOTE] = self.OnEventDismissRoomVote
     self._eventmap[Protocol.GAME_EVT_DISMISS_ROOM_FAIL] = self.OnEventDismissRoomFail
 
     self._eventmap[Protocol.GAME_EVT_INTERACTION] = self.OnEventInteraction

lua_probject/base_project/Game/Controller/GroupMgrController.lua

@@ -592,7 +592,6 @@ function M:OnMemberOut(evt_data)
 end
 
 function M:OnMemberOnline(evt_data)
-    --[[
     print("收到在线成员推送")
     pt(evt_data)
 
@@ -612,7 +611,6 @@ function M:OnMemberOnline(evt_data)
 
     DispatchEvent(self._dispatcher, GroupMgrEvent.OnMemberState, evt_data)
     Broadcast.Send(BroadcastEvent.OnMemberChange)
-    ]]
 end
 
 function M:OnMemberGameState(evt_data)

lua_probject/base_project/Game/Controller/RoomController.lua

@@ -169,8 +169,10 @@ function M:PublicJoinRoom(cmd, roomid, tem, callback, group_id, pid)
 			-- 圈子信息，圈子id和玩法id
 			room.group_id = json["groupId"]
 			-- 圈子禁止文字聊天，禁止语音聊天
-			room.ban_chat1 = json["ban_chat1"]
-			room.ban_chat2 = json["ban_chat2"]
+			--room.ban_chat1 = json["ban_chat1"]
+			--room.ban_chat2 = json["ban_chat2"]
+			-- 
+
 			-- 玩法id
 			room.play_id = json["pid"]
 			-- 体力值开关

lua_probject/base_project/Game/View/Common/BaseView.lua

@@ -63,6 +63,8 @@ function M:Show()
             local scaleY = GRoot.inst.height / self._contentPane.height
             local scaleX = GRoot.inst.width / self._contentPane.width
             self._contentPane:SetScale(scaleX, scaleY)
+            self._contentPane.x = 0
+            self._contentPane.y = 0
         end
     end
 end

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

@@ -8,6 +8,7 @@ function FamilyInviteFamilyView.new()
     setmetatable(M, { __index = BaseView })
     local self = setmetatable({}, { __index = M })
     self.class = "com_numberList"
+    self._scale = true
     BaseView.InitView(self, "ui://Family/com_numberList")
     self:initBtn()
     return self

lua_probject/base_project/Game/View/FamilyView.lua

@@ -220,8 +220,6 @@ function M:init(url)
         --FamilyChatRoom:Show(self.ChatRoomData)
         self.com_FamilyChatRoom:Show()
     end)
-
-    self:Reflash()
 end
 
 function M:Reflash()
@@ -1136,6 +1134,8 @@ function M:Show()
 
     self.Reflash()
     BaseView.Show(self)
+
+    self:Reflash()
 end
 
 function M:Close()

lua_probject/base_project/Game/View/MainView.lua

@@ -157,6 +157,7 @@ function M:InitView(url, isHideIpAdds)
         self:FillRoomConfig(roominfo_panel1, _room)
 
         -- 显示玩家距离
+        --[[
         -- self.btn_distance = self._view:GetChild('btn_distance')
         --self.btn_distance.displayObject.gameObject:SetActive(false)
         if self.btn_distance then
@@ -173,6 +174,7 @@ function M:InitView(url, isHideIpAdds)
                 -- self.distance_view:Show()
             end)
         end
+        ]]
 
         local btn_rule = self._view:GetChild('btn_rule')
         if btn_rule ~= nil then
@@ -282,11 +284,22 @@ function M:InitView(url, isHideIpAdds)
             if self.chat_view == nil then
                 self.chat_view = ChatView.new(self)
             end
+            --[[
             if self._room.ban_chat1 then
                 if self.chat_view.HideInputField then
                     self.chat_view:HideInputField()
                 end
             end
+            ]]
+
+            local group = DataManager.groups:get(self._room.group_id)
+            local play = group:getPlay(self._room.play_id)
+            local hpData = json.decode(play.hpData)
+            if hpData.BanChat and hpData.BanChat == 1 then
+                ViewUtil.ShowTips("本房间禁止快捷聊天")
+                return
+            end
+
             self.chat_view:Show()
         end)
     end
@@ -1018,9 +1031,9 @@ function M:OnPlayerEnter(...)
         -- self.distance_view._view:GetController("state").selectedIndex = self._state.selectedIndex > 0 and
         --     self._state.selectedIndex < 3 and 1 or 0
         -- self.distance_view:Show()
-        if self.btn_distance then
-            self.btn_distance:GetController("state").selectedIndex = 1
-        end
+        --if self.btn_distance then
+        --    self.btn_distance:GetController("state").selectedIndex = 1
+        --end
     end
     local info = self._player_info[self:GetPos(p.seat)]
     info:FillData(p)
@@ -1201,7 +1214,7 @@ function M:OnPlayerLeave(...)
     local info = self._player_info[self:GetPos(p.seat)]
     info._view.visible = false
     if not self._gamectr:CheckGPS() then
-        self.btn_distance:GetController("state").selectedIndex = 0
+        --self.btn_distance:GetController("state").selectedIndex = 0
     end
 end
 
@@ -1434,6 +1447,7 @@ end
 
 function M:Show()
     BaseView.Show(self)
+    --[[
     if self._state.selectedIndex == 0 and self._show_distance then
         if self._room.self_player.seat == 0 then
             return
@@ -1447,6 +1461,7 @@ function M:Show()
         -- self.distance_view:Show()
         -- self.btn_distance:GetController("state").selectedIndex = 1
     end
+    ]]
 end
 
 function M:Destroy()

lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua

@@ -896,9 +896,9 @@ function M:FillFagData_jiangxi()
     -- 功能
     self.hpData.GongNeng = cGongneng.selectedIndex + 1
     -- 开启聊天
-    self.hpData.canChat = cChat.selectedIndex
+    self.hpData.BanChat = cChat.selectedIndex
     -- 开启表情互动
-    self.hpData.canMissile = cMisslie.selectedIndex
+    self.hpData.BanMissile = cMisslie.selectedIndex
 
 
     local hpType = mod.data.game_data.hpType

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

@@ -143,7 +143,7 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
@@ -278,7 +278,7 @@ function M:EventInit()
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
-        self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
+        self._tex_LeftCard.text = string.format("余%d张", arg[3])
         -- self:UpdateRoomInfo()
         local info = self._player_card_info[self:GetPos(seat)]
         info:UpdateHandCard(true)
@@ -938,7 +938,7 @@ function M:ReloadRoom(bskip)
 
     if bskip == nil or bskip == false then
         self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
-        self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
+        self._tex_LeftCard.text = string.format("余%d张", room.left_count)
         self:UpdateRound()
     end
 end

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

@@ -272,7 +272,7 @@ function M:CopyLastStep(index)
 end
 
 function M:UpdateLeftCard(num)
-	self._tex_LeftCard.text = "剩余 " .. num .. " 张牌"
+	self._tex_LeftCard.text = "余" .. num .. "张"
 end
 
 function M:UpdateCardBox(seat)
@@ -287,7 +287,7 @@ function M:UpdateCardBox(seat)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

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

@@ -387,7 +387,7 @@ function M:OnFangziAction(...)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

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

@@ -143,7 +143,7 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
@@ -277,7 +277,7 @@ function M:EventInit()
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
-        self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
+        self._tex_LeftCard.text = string.format("余%d张", arg[3])
         -- self:UpdateRoomInfo()
         local info = self._player_card_info[self:GetPos(seat)]
         info:UpdateHandCard(true)
@@ -930,7 +930,7 @@ function M:ReloadRoom(bskip)
 
     if bskip == nil or bskip == false then
         self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
-        self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
+        self._tex_LeftCard.text = string.format("余%d张", room.left_count)
         self:UpdateRound()
     end
 end

lua_probject/extend_project/extend/majiang/jinxi/EXPlayBackView.lua

@@ -272,7 +272,7 @@ function M:CopyLastStep(index)
 end
 
 function M:UpdateLeftCard(num)
-	self._tex_LeftCard.text = "剩余 " .. num .. " 张牌"
+	self._tex_LeftCard.text = "余" .. num .. "张"
 end
 
 function M:UpdateCardBox(seat)
@@ -287,7 +287,7 @@ function M:UpdateCardBox(seat)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua

@@ -392,7 +392,7 @@ function M:OnFangziAction(...)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

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

@@ -142,7 +142,7 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
@@ -277,7 +277,7 @@ function M:EventInit()
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
-        self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
+        self._tex_LeftCard.text = string.format("余%d张", arg[3])
         -- self:UpdateRoomInfo()
         local info = self._player_card_info[self:GetPos(seat)]
         info:UpdateHandCard(true)
@@ -933,7 +933,7 @@ function M:ReloadRoom(bskip)
 
     if bskip == nil or bskip == false then
         self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
-        self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
+        self._tex_LeftCard.text = string.format("余%d张", room.left_count)
         self:UpdateRound()
     end
 end

lua_probject/extend_project/extend/majiang/lichuan/EXPlayBackView.lua

@@ -272,7 +272,7 @@ function M:CopyLastStep(index)
 end
 
 function M:UpdateLeftCard(num)
-    self._tex_LeftCard.text = "剩余 " .. num .. " 张牌"
+    self._tex_LeftCard.text = "余" .. num .. "张"
 end
 
 function M:UpdateCardBox(seat)
@@ -287,7 +287,7 @@ function M:UpdateCardBox(seat)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua

@@ -417,7 +417,7 @@ function M:OnFangziAction(...)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

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

@@ -141,7 +141,7 @@ function M:IsShowGangZi(btn, isShow)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 
@@ -275,7 +275,7 @@ function M:EventInit()
         local seat = arg[1]
         local card = arg[2]
         -- self._tex_leftTime.text = arg[3]
-        self._tex_LeftCard.text = string.format("剩余%d张牌", arg[3])
+        self._tex_LeftCard.text = string.format("余%d张", arg[3])
         -- self:UpdateRoomInfo()
         local info = self._player_card_info[self:GetPos(seat)]
         info:UpdateHandCard(true)
@@ -931,7 +931,7 @@ function M:ReloadRoom(bskip)
 
     if bskip == nil or bskip == false then
         self:UpdateCardBox(self:GetPos(room.curren_outcard_seat))
-        self._tex_LeftCard.text = string.format("剩余%d张牌", room.left_count)
+        self._tex_LeftCard.text = string.format("余%d张", room.left_count)
         self:UpdateRound()
     end
 end

lua_probject/extend_project/extend/majiang/nancheng/EXPlayBackView.lua

@@ -272,7 +272,7 @@ function M:CopyLastStep(index)
 end
 
 function M:UpdateLeftCard(num)
-	self._tex_LeftCard.text = "剩余 " .. num .. " 张牌"
+	self._tex_LeftCard.text = "余" .. num .. "张"
 end
 
 function M:UpdateCardBox(seat)
@@ -287,7 +287,7 @@ function M:UpdateCardBox(seat)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua

@@ -392,7 +392,7 @@ function M:OnFangziAction(...)
 end
 
 function M:UpdateRound()
-    self._view:GetChild("text_round").text = string.format("当前局数:%d/%d", self._room.curren_round,
+    self._view:GetChild("text_round").text = string.format("局数：%d /%d", self._room.curren_round,
         self._room.room_config.round)
 end
 

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -688,4 +688,10 @@ function M:OnResult1(...)
     end
 end
 
+function M:Show()
+    MainView.Show(self)
+
+    print(self._room)
+end
+
 return M

wb_new_ui/assets/Family/Main.xml

@@ -51,35 +51,35 @@
       <gearDisplay controller="lev" pages="0,1"/>
       <relation target="" sidePair="right-right"/>
     </component>
-    <image id="n353_jrro" name="n353" src="jrro7cy2" fileName="Main/Image/bg_left1.png" xy="29,143" size="420,1011" group="n360_jrro">
+    <image id="n353_jrro" name="n353" src="jrro7cy2" fileName="Main/Image/bg_left1.png" xy="6,143" size="439,1011" group="n360_jrro">
       <relation target="" sidePair="height-height,left-left"/>
     </image>
-    <image id="n354_jrro" name="n354" src="jrro7cyn" fileName="Main/Image/bg_left2.png" xy="48,161" size="384,978" group="n360_jrro">
+    <image id="n354_jrro" name="n354" src="jrro7cyn" fileName="Main/Image/bg_left2.png" xy="24,161" size="404,978" group="n360_jrro">
       <relation target="" sidePair="height-height,left-left"/>
     </image>
-    <group id="n360_jrro" name="bg_left" xy="29,143" size="420,1011" group="n34_86ct"/>
-    <image id="n355_jrro" name="n355" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="460,142" size="2070,1011" group="n362_jrro">
+    <group id="n360_jrro" name="bg_left" xy="6,143" size="439,1011" group="n34_86ct"/>
+    <image id="n355_jrro" name="n355" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="451,142" size="2075,1011" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left,rightext-right"/>
     </image>
-    <image id="n356_jrro" name="n356" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="479,160" size="2034,978" group="n362_jrro">
+    <image id="n356_jrro" name="n356" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="470,160" size="2039,978" group="n362_jrro">
       <relation target="" sidePair="left-left,top-top,rightext-right,bottomext-bottom"/>
     </image>
-    <image id="n357_jrro" name="n357" src="jrro7cyj" fileName="Main/Image/bg_main3.png" xy="490,277" size="2010,852" group="n362_jrro">
+    <image id="n357_jrro" name="n357" src="jrro7cyj" fileName="Main/Image/bg_main3.png" xy="481,277" size="2015,852" group="n362_jrro">
       <relation target="" sidePair="left-left,top-top,rightext-right,bottomext-bottom"/>
     </image>
-    <image id="n358_jrro" name="n358" src="jrro7cyi" fileName="Main/Image/bg_main4.png" xy="839,289" size="1652,828" group="n362_jrro">
+    <image id="n358_jrro" name="n358" src="jrro7cyi" fileName="Main/Image/bg_main4.png" xy="830,289" size="1657,828" group="n362_jrro">
       <relation target="" sidePair="left-left,top-top,rightext-right,bottomext-bottom"/>
     </image>
-    <image id="n363_jrro" name="n363" src="jrro7cyf" fileName="Main/Image/bg_mainOpenGame.png" xy="855,298" size="1623,66" group="n362_jrro">
+    <image id="n363_jrro" name="n363" src="jrro7cyf" fileName="Main/Image/bg_mainOpenGame.png" xy="846,298" size="1628,66" group="n362_jrro">
       <relation target="" sidePair="left-left,top-top,rightext-right"/>
     </image>
-    <group id="n362_jrro" name="bg_right" xy="460,142" size="2070,1011" group="n34_86ct"/>
-    <component id="n5_in3i" name="btn_inviteFriends" src="in3i7cug" fileName="Main/Component/btn_inviteFriends.xml" xy="500,323" size="321,105" group="n23_in3i"/>
-    <text id="n22_in3i" name="text_familyId" xy="649,379" size="111,42" group="n23_in3i" font="ui://27vd145bh35o7iln" fontSize="30" color="#ad3c3a" text="123456"/>
-    <group id="n23_in3i" name="inviteFriends" xy="500,323" size="321,105" group="n34_86ct" advanced="true">
+    <group id="n362_jrro" name="bg_right" xy="451,142" size="2075,1011" group="n34_86ct"/>
+    <component id="n5_in3i" name="btn_inviteFriends" src="in3i7cug" fileName="Main/Component/btn_inviteFriends.xml" xy="498,323" size="321,105" group="n23_in3i"/>
+    <text id="n22_in3i" name="text_familyId" xy="647,379" size="111,42" group="n23_in3i" font="ui://27vd145bh35o7iln" fontSize="30" color="#ad3c3a" text="123456"/>
+    <group id="n23_in3i" name="inviteFriends" xy="498,323" size="321,105" group="n34_86ct" advanced="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
-    <list id="n19_in3i" name="list_other" xy="48,180" size="384,958" group="n34_86ct" overflow="scroll" defaultItem="ui://htcn7v3rin3i7cun" autoClearItems="true">
+    <list id="n19_in3i" name="list_other" xy="31,180" size="391,958" group="n34_86ct" overflow="scroll" defaultItem="ui://htcn7v3rin3i7cun" autoClearItems="true">
       <relation target="" sidePair="height-height%,left-left"/>
       <item/>
       <item/>
@@ -105,7 +105,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n24_in3i" name="list_familyNumber" xy="499,437" size="322,591" group="n34_86ct" overflow="scroll" lineGap="20" defaultItem="ui://htcn7v3rin3i7cur" autoItemSize="false">
+    <list id="n24_in3i" name="list_familyNumber" xy="497,437" size="322,591" group="n34_86ct" overflow="scroll" lineGap="20" defaultItem="ui://htcn7v3rin3i7cur" autoItemSize="false">
       <relation target="" sidePair="height-height,left-left"/>
       <item/>
       <item/>
@@ -117,7 +117,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n28_in3i" name="list_room" xy="854,377" size="1636,738" group="n34_86ct" overflow="scroll" lineGap="12" defaultItem="ui://htcn7v3rin3i7cuh" autoItemSize="false" autoClearItems="true">
+    <list id="n28_in3i" name="list_room" xy="842,377" size="1641,738" group="n34_86ct" overflow="scroll" lineGap="12" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
       <relation target="" sidePair="left-left,rightext-right,bottomext-bottom"/>
       <item/>
       <item/>
@@ -127,15 +127,16 @@
     <component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="574,1028" group="n34_86ct">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <text id="n364_jrro" name="n364" xy="1556,297" size="232,64" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="48" color="#444444" text="dangqian">
+    <text id="n364_jrro" name="n364" xy="1546,297" size="232,64" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="48" color="#444444" text="dangqian">
       <relation target="n28_in3i" sidePair="center-center,bottom-top"/>
     </text>
     <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="rightext-right,bottomext-bottom"/>
     </graph>
-    <text id="n372_ajr3" name="text_banMain" xy="1376,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打烊">
+    <text id="n372_ajr3" name="text_banMain" xy="1359,685" size="605,121" group="n34_86ct" font="ui://27vd145bh35o7il2" fontSize="60" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="该亲友圈已打烊...">
       <gearDisplay controller="familyBan" pages="1"/>
+      <relation target="n28_in3i" sidePair="center-center,middle-middle"/>
     </text>
     <component id="n391_j0cy" name="com_chatRoom" src="ieus7d1d" fileName="ChatRoom/com_chatRoom.xml" xy="1,0" size="2532,1170" group="n34_86ct">
       <gearDisplay controller="cIsChatRoom" pages="1"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.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="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"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>
@@ -10,7 +10,7 @@
   <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="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1209,328" 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"/>
@@ -125,23 +125,23 @@
     <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,921" size="153,120">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
       <gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="739,916" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="56,796" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="1,3,4" values="56,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="1189,223" size="153,132">
+    <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,223|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="1886,538" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,37" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,37|1740,46|1752,62" default="1192,928"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1489,6 +1489,10 @@
     <component id="f8c31ej" name="com_hePaiEffect.xml" path="/image/"/>
     <movieclip id="f8c31a" name="xingxing.jta" path="/"/>
     <image id="f8c31ek" name="img_card_arrow.png" path="/images/"/>
+    <component id="q0vz1el" name="com_gameInfoWindow.xml" path="/Main_new/GameInfoWindow/" exported="true"/>
+    <image id="q0vz1em" name="bg 5.png" path="/Main_new/Image/"/>
+    <image id="q0vz1en" name="CommonRes_3 5.png" path="/Main_new/Image/"/>
+    <component id="q0vz1ep" name="btn_quit.xml" path="/Main_new/GameInfoWindow/Component/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>